X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=reflog-walk.c;h=c983858259f717b3ed9d0f00921aec92219c1ad3;hb=723024d696a47556baac77700e47fef288691f37;hp=8e2cd2fcf603cdcf667b8d5d9c61a6ce902dd189;hpb=40ab7c33cd6dfdf887ed15baee1325ee445eced7;p=git.git

diff --git a/reflog-walk.c b/reflog-walk.c
index 8e2cd2fcf..c98385825 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -165,7 +165,28 @@ void add_reflog_for_walk(struct reflog_walk_info *info,
 	if (item)
 		reflogs = item->util;
 	else {
+		if (*branch == '\0') {
+			unsigned char sha1[20];
+			const char *head = resolve_ref("HEAD", sha1, 0, NULL);
+			if (!head)
+				die ("No current branch");
+			free(branch);
+			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
@@ -219,7 +240,8 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
 	commit->object.flags &= ~(ADDED | SEEN | SHOWN);
 }
 
-void show_reflog_message(struct reflog_walk_info* info, int oneline)
+void show_reflog_message(struct reflog_walk_info* info, int oneline,
+	int relative_date)
 {
 	if (info && info->last_commit_reflog) {
 		struct commit_reflog *commit_reflog = info->last_commit_reflog;
@@ -228,18 +250,19 @@ void show_reflog_message(struct reflog_walk_info* info, int oneline)
 		info = &commit_reflog->reflogs->items[commit_reflog->recno+1];
 		if (oneline) {
 			printf("%s@{", commit_reflog->reflogs->ref);
-			if (commit_reflog->flag)
+			if (commit_reflog->flag || relative_date)
 				printf("%s", show_date(info->timestamp, 0, 1));
 			else
 				printf("%d", commit_reflog->reflogs->nr
 				       - 2 - commit_reflog->recno);
-			printf("}: ");
+			printf("}: %s", info->message);
 		}
 		else {
 			printf("Reflog: %s@{", commit_reflog->reflogs->ref);
-			if (commit_reflog->flag)
-				printf("%s", show_rfc2822_date(info->timestamp,
-							       info->tz));
+			if (commit_reflog->flag || relative_date)
+				printf("%s", show_date(info->timestamp,
+							info->tz,
+							relative_date));
 			else
 				printf("%d", commit_reflog->reflogs->nr
 				       - 2 - commit_reflog->recno);