diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-21 01:14:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-21 18:07:48 +0200 |
| commit | 4674ab682dc1a875fd29de8f4e9568196a88b97b (patch) | |
| tree | 6fb4d29ac9e7021f7fc2cff12a32864a382d3b13 /t/t1517-outside-repo.sh | |
| parent | builtin/hash-object: fix uninitialized hash function (diff) | |
| download | git-4674ab682dc1a875fd29de8f4e9568196a88b97b.tar.xz git-4674ab682dc1a875fd29de8f4e9568196a88b97b.zip | |
apply: fix uninitialized hash function
"git apply" can work outside a repository as a better "GNU patch",
but when it does so, it still assumed that it can access
the_hash_algo, which is no longer true in the new world order.
Make sure we explicitly fall back to SHA-1 algorithm for backward
compatibility.
It is of dubious value to make this configurable to other hash
algorithms, as the code does not use the_hash_algo for hashing
purposes when working outside a repository (which is how
the_hash_algo is left to NULL)---it is only used to learn the max
length of the hash when parsing the object names on the "index"
line, but failing to parse the "index" line is not a hard failure,
and the program does not support operations like applying binary
patches and --3way fallback that requires object access outside a
repository.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1517-outside-repo.sh')
| -rwxr-xr-x | t/t1517-outside-repo.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1517-outside-repo.sh b/t/t1517-outside-repo.sh index 2d8982d61a..557808ffa7 100755 --- a/t/t1517-outside-repo.sh +++ b/t/t1517-outside-repo.sh @@ -37,7 +37,7 @@ test_expect_success 'hash-object outside repository (uses SHA-1)' ' test_cmp hash.expect hash.actual ' -test_expect_failure 'apply a patch outside repository' ' +test_expect_success 'apply a patch outside repository' ' ( cd non-repo && cp ../nums.old nums && |