diff options
| author | Stefan Beller <sbeller@google.com> | 2018-06-28 18:21:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-29 10:43:38 -0700 |
| commit | f86bcc7b2ce6cad68ba1a48a528e380c6126705e (patch) | |
| tree | 72899ee32edb0e528b03ab6e1123a13c48abbb96 /builtin/am.c | |
| parent | blob: add repository argument to lookup_blob (diff) | |
| download | git-f86bcc7b2ce6cad68ba1a48a528e380c6126705e.tar.gz git-f86bcc7b2ce6cad68ba1a48a528e380c6126705e.zip | |
tree: add repository argument to lookup_tree
Add a repository argument to allow the callers of lookup_tree
to be more specific about which repository to act on. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to catch callers passing a
repository other than the_repository at compile time.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/am.c')
| -rw-r--r-- | builtin/am.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c index 6273ea5195..72e928cee7 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -32,6 +32,7 @@ #include "apply.h" #include "string-list.h" #include "packfile.h" +#include "repository.h" /** * Returns 1 if the file is empty or does not exist, 0 otherwise. @@ -1400,9 +1401,10 @@ static void write_index_patch(const struct am_state *state) FILE *fp; if (!get_oid_tree("HEAD", &head)) - tree = lookup_tree(&head); + tree = lookup_tree(the_repository, &head); else - tree = lookup_tree(the_hash_algo->empty_tree); + tree = lookup_tree(the_repository, + the_repository->hash_algo->empty_tree); fp = xfopen(am_path(state, "patch"), "w"); init_revisions(&rev_info, NULL); |