From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v4 5/5] apply: fix uninitialized hash function
Date: Mon, 13 May 2024 18:14:37 -0700 [thread overview]
Message-ID: <20240514011437.3779151-6-gitster@pobox.com> (raw)
In-Reply-To: <20240514011437.3779151-1-gitster@pobox.com>
"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.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/apply.c | 4 ++++
t/t1517-outside-repo.sh | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 861a01910c..e9175f820f 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1,6 +1,7 @@
#include "builtin.h"
#include "gettext.h"
#include "repository.h"
+#include "hash.h"
#include "apply.h"
static const char * const apply_usage[] = {
@@ -18,6 +19,9 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
if (init_apply_state(&state, the_repository, prefix))
exit(128);
+ if (!the_hash_algo)
+ repo_set_hash_algo(the_repository, GIT_HASH_SHA1);
+
argc = apply_parse_options(argc, argv,
&state, &force_apply, &options,
apply_usage);
diff --git a/t/t1517-outside-repo.sh b/t/t1517-outside-repo.sh
index 854bb8f343..6f32a40c6d 100755
--- a/t/t1517-outside-repo.sh
+++ b/t/t1517-outside-repo.sh
@@ -39,7 +39,7 @@ test_expect_success 'hash-object outside repository' '
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 &&
--
2.45.0-145-g3e4a232f6e
next prev parent reply other threads:[~2024-05-14 1:15 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-13 7:15 [PATCH 0/2] Fix use of uninitialized hash algos Patrick Steinhardt
2024-05-13 7:15 ` [PATCH 1/2] builtin/patch-id: fix uninitialized hash function Patrick Steinhardt
2024-05-13 7:15 ` [PATCH 2/2] builtin/hash-object: " Patrick Steinhardt
2024-05-14 0:16 ` Junio C Hamano
2024-05-13 16:01 ` [PATCH 0/2] Fix use of uninitialized hash algos Junio C Hamano
2024-05-13 18:36 ` Junio C Hamano
2024-05-13 19:21 ` [PATCH v2 0/4] Fix use of uninitialized hash algorithms Junio C Hamano
2024-05-13 19:21 ` [PATCH v2 1/4] setup: add an escape hatch for "no more default hash algorithm" change Junio C Hamano
2024-05-13 19:48 ` Kyle Lippincott
2024-05-13 19:21 ` [PATCH v2 2/4] t1517: test commands that are designed to be run outside repository Junio C Hamano
2024-05-13 19:57 ` Kyle Lippincott
2024-05-13 20:33 ` Junio C Hamano
2024-05-13 21:00 ` Junio C Hamano
2024-05-13 21:07 ` Kyle Lippincott
2024-05-13 19:21 ` [PATCH v2 3/4] builtin/patch-id: fix uninitialized hash function Junio C Hamano
2024-05-13 19:21 ` [PATCH v2 4/4] builtin/hash-object: " Junio C Hamano
2024-05-13 21:28 ` [PATCH 5/4] apply: " Junio C Hamano
2024-05-13 22:41 ` [PATCH v3 0/5] Fix use of uninitialized hash algorithms Junio C Hamano
2024-05-13 22:41 ` [PATCH v3 1/5] setup: add an escape hatch for "no more default hash algorithm" change Junio C Hamano
2024-05-13 22:41 ` [PATCH v3 2/5] t1517: test commands that are designed to be run outside repository Junio C Hamano
2024-05-13 22:41 ` [PATCH v3 3/5] builtin/patch-id: fix uninitialized hash function Junio C Hamano
2024-05-13 23:11 ` Junio C Hamano
2024-05-14 4:31 ` Patrick Steinhardt
2024-05-14 15:52 ` Junio C Hamano
2024-05-13 22:41 ` [PATCH v3 4/5] builtin/hash-object: " Junio C Hamano
2024-05-13 23:13 ` Junio C Hamano
2024-05-14 4:32 ` Patrick Steinhardt
2024-05-14 15:55 ` Junio C Hamano
2024-05-13 22:41 ` [PATCH v3 5/5] apply: " Junio C Hamano
2024-05-14 1:14 ` [PATCH v4 0/5] Fix use of uninitialized hash algorithms Junio C Hamano
2024-05-14 1:14 ` [PATCH v4 1/5] setup: add an escape hatch for "no more default hash algorithm" change Junio C Hamano
2024-05-14 4:32 ` Patrick Steinhardt
2024-05-14 15:05 ` Junio C Hamano
2024-05-14 17:19 ` Junio C Hamano
2024-05-15 12:23 ` Patrick Steinhardt
2024-05-16 15:31 ` Junio C Hamano
2024-05-14 1:14 ` [PATCH v4 2/5] t1517: test commands that are designed to be run outside repository Junio C Hamano
2024-05-14 4:32 ` Patrick Steinhardt
2024-05-14 15:08 ` Junio C Hamano
2024-05-15 12:24 ` Patrick Steinhardt
2024-05-15 14:15 ` Junio C Hamano
2024-05-15 14:25 ` Patrick Steinhardt
2024-05-15 15:40 ` Junio C Hamano
2024-05-14 1:14 ` [PATCH v4 3/5] builtin/patch-id: fix uninitialized hash function Junio C Hamano
2024-05-14 1:14 ` [PATCH v4 4/5] builtin/hash-object: " Junio C Hamano
2024-05-17 23:49 ` Junio C Hamano
2024-05-20 21:19 ` Junio C Hamano
2024-05-20 22:45 ` Junio C Hamano
2024-05-14 1:14 ` Junio C Hamano [this message]
2024-05-20 23:14 ` [PATCH v5 0/5] Fix use of uninitialized hash algorithms Junio C Hamano
2024-05-20 23:14 ` [PATCH v5 1/5] setup: add an escape hatch for "no more default hash algorithm" change Junio C Hamano
2024-05-21 7:57 ` Patrick Steinhardt
2024-05-21 15:59 ` Junio C Hamano
2024-05-20 23:14 ` [PATCH v5 2/5] t1517: test commands that are designed to be run outside repository Junio C Hamano
2024-05-20 23:14 ` [PATCH v5 3/5] builtin/patch-id: fix uninitialized hash function Junio C Hamano
2024-05-20 23:14 ` [PATCH v5 4/5] builtin/hash-object: " Junio C Hamano
2024-05-20 23:14 ` [PATCH v5 5/5] apply: " Junio C Hamano
2024-05-21 7:58 ` Patrick Steinhardt
2024-05-21 13:36 ` Junio C Hamano
2024-05-21 7:58 ` [PATCH v5 0/5] Fix use of uninitialized hash algorithms Patrick Steinhardt
2024-05-21 18:07 ` Junio C Hamano
2024-05-22 4:51 ` Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240514011437.3779151-6-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).