[PATCH] log --reflog: use dwim_log
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Feb 9, 2007, 00:28 UTC
- Message-ID
- <Pine.LNX.4.63.0702090127510.22628@wbgn013.biozentrum.uni-wuerzburg.de>
- In-Reply-To
- <7vveicw850.fsf@assigned-by-dhcp.cox.net>
Since "git log origin/master" uses dwim_log() to match "refs/remotes/origin/master", it makes sense to do that for "git log --reflog", too.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> ---
I changed dwim_ref() to dwim_log() as per Nico's request.
cache.h | 1 + reflog-walk.c | 13 +++++++++++++ sha1_name.c | 2 +- 3 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/cache.h b/cache.h index 6f55fdc..44941c0 100644 --- a/cache.h +++ b/cache.h @@ -304,6 +304,7 @@ extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */ extern int read_ref(const char *filename, unsigned char *sha1); extern const char *resolve_ref(const char *path, unsigned char *sha1, int, int *); extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref); +extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref); extern int create_symref(const char *ref, const char *refs_heads_master, const char *logmsg); extern int validate_headref(const char *ref); diff --git a/reflog-walk.c b/reflog-walk.c index 653ec95..e0f1332 100644 --- a/reflog-walk.c +++ b/reflog-walk.c @@ -174,6 +174,19 @@ void add_reflog_for_walk(struct reflog_walk_info *info, branch = xstrdup(head); } reflogs = read_complete_reflog(branch); + if (!reflogs || reflogs->nr == 0) { + unsigned char sha1[20]; + char *b; + if (dwim_log(branch, strlen(branch), sha1, &b) == 1) { + if (reflogs) { + free(reflogs->ref); + free(reflogs); + } + free(branch); + branch = b; + reflogs = read_complete_reflog(branch); + } + } if (!reflogs || reflogs->nr == 0) die("No reflogs found for '%s'", branch); path_list_insert(branch, &info->complete_reflogs)->util diff --git a/sha1_name.c b/sha1_name.c index d0d9536..c50a378 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -268,7 +268,7 @@ int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref) return refs_found; } -static int dwim_log(const char *str, int len, unsigned char *sha1, char **log) +int dwim_log(const char *str, int len, unsigned char *sha1, char **log) { const char **p; int logs_found = 0;
-- 1.5.0.rc4.2051.g679c-dirty