|
| 1 | +diff --git a/node_modules/isomorphic-git/index.cjs b/node_modules/isomorphic-git/index.cjs |
| 2 | +index ae4d526..9d9b046 100644 |
| 3 | +--- a/node_modules/isomorphic-git/index.cjs |
| 4 | ++++ b/node_modules/isomorphic-git/index.cjs |
| 5 | +@@ -2935,38 +2935,66 @@ async function _readObject({ |
| 6 | + return result |
| 7 | + } |
| 8 | + |
| 9 | +- // BEHOLD! THE ONLY TIME I'VE EVER WANTED TO USE A CASE STATEMENT WITH FOLLOWTHROUGH! |
| 10 | +- // eslint-ignore |
| 11 | +- /* eslint-disable no-fallthrough */ |
| 12 | +- switch (result.format) { |
| 13 | +- case 'deflated': { |
| 14 | +- result.object = Buffer.from(await inflate(result.object)); |
| 15 | +- result.format = 'wrapped'; |
| 16 | +- } |
| 17 | +- case 'wrapped': { |
| 18 | +- if (format === 'wrapped' && result.format === 'wrapped') { |
| 19 | +- return result |
| 20 | +- } |
| 21 | +- const sha = await shasum(result.object); |
| 22 | +- if (sha !== oid) { |
| 23 | +- throw new InternalError( |
| 24 | +- `SHA check failed! Expected ${oid}, computed ${sha}` |
| 25 | +- ) |
| 26 | +- } |
| 27 | +- const { object, type } = GitObject.unwrap(result.object); |
| 28 | +- result.type = type; |
| 29 | +- result.object = object; |
| 30 | +- result.format = 'content'; |
| 31 | +- } |
| 32 | +- case 'content': { |
| 33 | +- if (format === 'content') return result |
| 34 | +- break |
| 35 | ++ // // BEHOLD! THE ONLY TIME I'VE EVER WANTED TO USE A CASE STATEMENT WITH FOLLOWTHROUGH! |
| 36 | ++ // // eslint-ignore |
| 37 | ++ // /* eslint-disable no-fallthrough */ |
| 38 | ++ // switch (result.format) { |
| 39 | ++ // case 'deflated': { |
| 40 | ++ // result.object = Buffer.from(await inflate(result.object)); |
| 41 | ++ // result.format = 'wrapped'; |
| 42 | ++ // } |
| 43 | ++ // case 'wrapped': { |
| 44 | ++ // if (format === 'wrapped' && result.format === 'wrapped') { |
| 45 | ++ // return result |
| 46 | ++ // } |
| 47 | ++ // const sha = await shasum(result.object); |
| 48 | ++ // if (sha !== oid) { |
| 49 | ++ // throw new InternalError( |
| 50 | ++ // `SHA check failed! Expected ${oid}, computed ${sha}` |
| 51 | ++ // ) |
| 52 | ++ // } |
| 53 | ++ // const { object, type } = GitObject.unwrap(result.object); |
| 54 | ++ // result.type = type; |
| 55 | ++ // result.object = object; |
| 56 | ++ // result.format = 'content'; |
| 57 | ++ // } |
| 58 | ++ // case 'content': { |
| 59 | ++ // if (format === 'content') return result |
| 60 | ++ // break |
| 61 | ++ // } |
| 62 | ++ // default: { |
| 63 | ++ // throw new InternalError(`invalid format "${result.format}"`) |
| 64 | ++ // } |
| 65 | ++ // } |
| 66 | ++ // /* eslint-enable no-fallthrough */ |
| 67 | ++ |
| 68 | ++ /* manually patching https://github.com/isomorphic-git/isomorphic-git/pull/1247 */ |
| 69 | ++ /* note: this is commonjs export of this package, usually ignored in favour of index.js */ |
| 70 | ++ if (result.format === 'deflated') { |
| 71 | ++ result.object = Buffer.from(await inflate(result.object)) |
| 72 | ++ result.format = 'wrapped' |
| 73 | ++ } |
| 74 | ++ |
| 75 | ++ if (result.format === 'wrapped') { |
| 76 | ++ if (format === 'wrapped' && result.format === 'wrapped') { |
| 77 | ++ return result |
| 78 | + } |
| 79 | +- default: { |
| 80 | +- throw new InternalError(`invalid format "${result.format}"`) |
| 81 | ++ const sha = await shasum(result.object) |
| 82 | ++ if (sha !== oid) { |
| 83 | ++ throw new InternalError( |
| 84 | ++ `SHA check failed! Expected ${oid}, computed ${sha}` |
| 85 | ++ ) |
| 86 | + } |
| 87 | ++ const { object, type } = GitObject.unwrap(result.object) |
| 88 | ++ result.type = type |
| 89 | ++ result.object = object |
| 90 | ++ result.format = 'content' |
| 91 | ++ } |
| 92 | ++ |
| 93 | ++ if (result.format === 'content') { |
| 94 | ++ if (format === 'content') return result |
| 95 | ++ return |
| 96 | + } |
| 97 | +- /* eslint-enable no-fallthrough */ |
| 98 | + } |
| 99 | + |
| 100 | + class AlreadyExistsError extends BaseError { |
| 101 | +@@ -10337,7 +10365,8 @@ async function _log({ fs, cache, gitdir, ref, depth, since }) { |
| 102 | + const oid = await GitRefManager.resolve({ fs, gitdir, ref }); |
| 103 | + const tips = [await _readCommit({ fs, cache, gitdir, oid })]; |
| 104 | + |
| 105 | +- while (true) { |
| 106 | ++ // https://github.com/isomorphic-git/isomorphic-git/pull/1248 |
| 107 | ++ while (tips.length > 0) { |
| 108 | + const commit = tips.pop(); |
| 109 | + |
| 110 | + // Stop the log if we've hit the age limit |
| 111 | +diff --git a/node_modules/isomorphic-git/index.js b/node_modules/isomorphic-git/index.js |
| 112 | +index 8335d52..6a6ebd4 100644 |
| 113 | +--- a/node_modules/isomorphic-git/index.js |
| 114 | ++++ b/node_modules/isomorphic-git/index.js |
| 115 | +@@ -2929,38 +2929,66 @@ async function _readObject({ |
| 116 | + return result |
| 117 | + } |
| 118 | + |
| 119 | +- // BEHOLD! THE ONLY TIME I'VE EVER WANTED TO USE A CASE STATEMENT WITH FOLLOWTHROUGH! |
| 120 | +- // eslint-ignore |
| 121 | +- /* eslint-disable no-fallthrough */ |
| 122 | +- switch (result.format) { |
| 123 | +- case 'deflated': { |
| 124 | +- result.object = Buffer.from(await inflate(result.object)); |
| 125 | +- result.format = 'wrapped'; |
| 126 | +- } |
| 127 | +- case 'wrapped': { |
| 128 | +- if (format === 'wrapped' && result.format === 'wrapped') { |
| 129 | +- return result |
| 130 | +- } |
| 131 | +- const sha = await shasum(result.object); |
| 132 | +- if (sha !== oid) { |
| 133 | +- throw new InternalError( |
| 134 | +- `SHA check failed! Expected ${oid}, computed ${sha}` |
| 135 | +- ) |
| 136 | +- } |
| 137 | +- const { object, type } = GitObject.unwrap(result.object); |
| 138 | +- result.type = type; |
| 139 | +- result.object = object; |
| 140 | +- result.format = 'content'; |
| 141 | +- } |
| 142 | +- case 'content': { |
| 143 | +- if (format === 'content') return result |
| 144 | +- break |
| 145 | ++ // // BEHOLD! THE ONLY TIME I'VE EVER WANTED TO USE A CASE STATEMENT WITH FOLLOWTHROUGH! |
| 146 | ++ // // eslint-ignore |
| 147 | ++ // /* eslint-disable no-fallthrough */ |
| 148 | ++ // switch (result.format) { |
| 149 | ++ // case 'deflated': { |
| 150 | ++ // result.object = Buffer.from(await inflate(result.object)); |
| 151 | ++ // result.format = 'wrapped'; |
| 152 | ++ // } |
| 153 | ++ // case 'wrapped': { |
| 154 | ++ // if (format === 'wrapped' && result.format === 'wrapped') { |
| 155 | ++ // return result |
| 156 | ++ // } |
| 157 | ++ // const sha = await shasum(result.object); |
| 158 | ++ // if (sha !== oid) { |
| 159 | ++ // throw new InternalError( |
| 160 | ++ // `SHA check failed! Expected ${oid}, computed ${sha}` |
| 161 | ++ // ) |
| 162 | ++ // } |
| 163 | ++ // const { object, type } = GitObject.unwrap(result.object); |
| 164 | ++ // result.type = type; |
| 165 | ++ // result.object = object; |
| 166 | ++ // result.format = 'content'; |
| 167 | ++ // } |
| 168 | ++ // case 'content': { |
| 169 | ++ // if (format === 'content') return result |
| 170 | ++ // break |
| 171 | ++ // } |
| 172 | ++ // default: { |
| 173 | ++ // throw new InternalError(`invalid format "${result.format}"`) |
| 174 | ++ // } |
| 175 | ++ // } |
| 176 | ++ // /* eslint-enable no-fallthrough */ |
| 177 | ++ |
| 178 | ++ /* manually patching https://github.com/isomorphic-git/isomorphic-git/pull/1247 */ |
| 179 | ++ /* note: this is es module export of this package, usually used instead of index.cjs */ |
| 180 | ++ if (result.format === 'deflated') { |
| 181 | ++ result.object = Buffer.from(await inflate(result.object)) |
| 182 | ++ result.format = 'wrapped' |
| 183 | ++ } |
| 184 | ++ |
| 185 | ++ if (result.format === 'wrapped') { |
| 186 | ++ if (format === 'wrapped' && result.format === 'wrapped') { |
| 187 | ++ return result |
| 188 | + } |
| 189 | +- default: { |
| 190 | +- throw new InternalError(`invalid format "${result.format}"`) |
| 191 | ++ const sha = await shasum(result.object) |
| 192 | ++ if (sha !== oid) { |
| 193 | ++ throw new InternalError( |
| 194 | ++ `SHA check failed! Expected ${oid}, computed ${sha}` |
| 195 | ++ ) |
| 196 | + } |
| 197 | ++ const { object, type } = GitObject.unwrap(result.object) |
| 198 | ++ result.type = type |
| 199 | ++ result.object = object |
| 200 | ++ result.format = 'content' |
| 201 | ++ } |
| 202 | ++ |
| 203 | ++ if (result.format === 'content') { |
| 204 | ++ if (format === 'content') return result |
| 205 | ++ return |
| 206 | + } |
| 207 | +- /* eslint-enable no-fallthrough */ |
| 208 | + } |
| 209 | + |
| 210 | + class AlreadyExistsError extends BaseError { |
| 211 | +@@ -10331,7 +10359,8 @@ async function _log({ fs, cache, gitdir, ref, depth, since }) { |
| 212 | + const oid = await GitRefManager.resolve({ fs, gitdir, ref }); |
| 213 | + const tips = [await _readCommit({ fs, cache, gitdir, oid })]; |
| 214 | + |
| 215 | +- while (true) { |
| 216 | ++ // https://github.com/isomorphic-git/isomorphic-git/pull/1248 |
| 217 | ++ while (tips.length > 0) { |
| 218 | + const commit = tips.pop(); |
| 219 | + |
| 220 | + // Stop the log if we've hit the age limit |
0 commit comments