diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-08-23 11:36:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-25 20:27:37 (GMT) |
| commit | 6f45ec88d2168013b00b46d8593524ca5b6c0acb (patch) | |
| tree | 3028916a6c9f5f1d45bfd803dc595d290db7d3b6 /refs.c | |
| parent | 81bc12258958ad293598840ad28df3817c9f4dfb (diff) | |
| download | git-6f45ec88d2168013b00b46d8593524ca5b6c0acb.zip git-6f45ec88d2168013b00b46d8593524ca5b6c0acb.tar.gz git-6f45ec88d2168013b00b46d8593524ca5b6c0acb.tar.bz2 | |
refs: make repo_dwim_log() accept a NULL oid
Change the repo_dwim_log() function initially added as dwim_log() in
eb3a48221fd (log --reflog: use dwim_log, 2007-02-09) to accept a NULL
oid parameter. The refs_resolve_ref_unsafe() function it invokes
already deals with it, but it didn't.
This allows for a bit more clarity in a reflog-walk.c codepath added
in f2eba66d4d1 (Enable HEAD@{...} and make it independent from the
current branch, 2007-02-03). We'll shortly use this in
builtin/reflog.c as well.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.c')
| -rw-r--r-- | refs.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -698,7 +698,7 @@ int repo_dwim_log(struct repository *r, const char *str, int len, strbuf_addf(&path, *p, len, str); ref = refs_resolve_ref_unsafe(refs, path.buf, RESOLVE_REF_READING, - &hash, NULL); + oid ? &hash : NULL, NULL); if (!ref) continue; if (refs_reflog_exists(refs, path.buf)) @@ -710,7 +710,8 @@ int repo_dwim_log(struct repository *r, const char *str, int len, continue; if (!logs_found++) { *log = xstrdup(it); - oidcpy(oid, &hash); + if (oid) + oidcpy(oid, &hash); } if (!warn_ambiguous_refs) break; |