Skip to content

Commit

Permalink
apply: fix uninitialized hash function
Browse files Browse the repository at this point in the history
"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 <[email protected]>
  • Loading branch information
gitster committed May 21, 2024
1 parent 8d058b8 commit 4674ab6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
10 changes: 10 additions & 0 deletions builtin/apply.c
Original file line number Diff line number Diff line change
@@ -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[] = {
Expand All @@ -18,6 +19,15 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
if (init_apply_state(&state, the_repository, prefix))
exit(128);

/*
* We could to redo the "apply.c" machinery to make this
* arbitrary fallback unnecessary, but it is dubious that it
* is worth the effort.
* cf. https://lore.kernel.org/git/[email protected]/
*/
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);
Expand Down
2 changes: 1 addition & 1 deletion t/t1517-outside-repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit 4674ab6

Please sign in to comment.