diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-22T16·46+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-22T16·46+0100 |
| commit | 5229c9b232de5bfa959ad6ebbb4c8192ac513352 (patch) | |
| tree | 8539e7e23682cac110900f946f034ae44162cacd /third_party/git/t/t4100/t-apply-7.patch | |
| parent | f2b211131f2347342dde63975b09cf603149f1a3 (diff) | |
| parent | 8518a7a51faaf50f830646d4c3585f51236b9349 (diff) | |
merge(3p/git): Merge git upstream at v2.26.2 r/808
Diffstat (limited to 'third_party/git/t/t4100/t-apply-7.patch')
| -rw-r--r-- | third_party/git/t/t4100/t-apply-7.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/t/t4100/t-apply-7.patch b/third_party/git/t/t4100/t-apply-7.patch index 07c6589e74..fa24305108 100644 --- a/third_party/git/t/t4100/t-apply-7.patch +++ b/third_party/git/t/t4100/t-apply-7.patch @@ -335,7 +335,7 @@ diff a/ls-tree.c b/ls-tree.c - /* If this is an exact directory match, we may have - * directory files following this path. Match on them. -- * Otherwise, we're at a pach subcomponent, and we need +- * Otherwise, we're at a patch subcomponent, and we need - * to try to match again. + if (e->directory) { + /* If this is a directory, we have the following cases: |