[PATCH 4/4] packed refs: pass .git dir instead of packed-refs path to init_fn
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Sep 12, 2017, 17:32 UTC
- Message-ID
- <20170912173234.GE144745@aiede.mtv.corp.google.com>
- In-Reply-To
- <20170912172330.GA144745@aiede.mtv.corp.google.com>
From: Stefan Beller <sbeller@google.com>
The first argument of a ref_store_init_fn is documented to represent the $GIT_DIR, not the path to the packed-refs file. This brings the packed-refs store more in line with the usual ref store interface.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Stefan Beller <sbeller@google.com> --- That's the end of the series. Thanks for reading.
refs/files-backend.c | 4 ++-- refs/packed-backend.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c index fccbc24ac4..3b8e13a8b7 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -57,8 +57,8 @@ static struct ref_store *files_ref_store_create(const char *gitdir, refs->gitdir = xstrdup(gitdir); get_common_dir_noenv(&sb, gitdir); refs->gitcommondir = strbuf_detach(&sb, NULL); - strbuf_addf(&sb, "%s/packed-refs", refs->gitcommondir); - refs->packed_ref_store = packed_ref_store_create(sb.buf, flags); + refs->packed_ref_store = + packed_ref_store_create(refs->gitcommondir, flags); strbuf_release(&sb); return ref_store; diff --git a/refs/packed-backend.c b/refs/packed-backend.c index 412c85034f..2c5db15279 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -78,7 +78,7 @@ struct packed_ref_store { struct tempfile tempfile; }; -struct ref_store *packed_ref_store_create(const char *path, +struct ref_store *packed_ref_store_create(const char *common_dir, unsigned int store_flags) { struct packed_ref_store *refs = xcalloc(1, sizeof(*refs)); @@ -87,7 +87,7 @@ struct ref_store *packed_ref_store_create(const char *path, base_ref_store_init(ref_store, &refs_be_packed); refs->store_flags = store_flags; - refs->path = xstrdup(path); + refs->path = xstrfmt("%s/packed-refs", common_dir); return ref_store; }
-- 2.14.1.690.gbb1197296e