mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 02:53:55 +01:00
Code

reflog: fix warning message.

Browse Source 
When ref@{N} is specified on a ref that has only M entries (M < N),
instead of saying the initial timestamp the reflog has, warn that
there is only M entries.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-12-18 22:07:45 -08:00
parent 63049292e0
commit e29cb53a8b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
refs.c
View File

@ -1013,7 +1013,7 @@ int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *
{ {
const char *logfile, *logdata, *logend, *rec, *lastgt, *lastrec; const char *logfile, *logdata, *logend, *rec, *lastgt, *lastrec;
char *tz_c; char *tz_c;
int logfd, tz; int logfd, tz, reccnt = 0;
struct stat st; struct stat st;
unsigned long date; unsigned long date;
unsigned char logged_sha1[20]; unsigned char logged_sha1[20];
@ -1031,6 +1031,7 @@ int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *
lastrec = NULL; lastrec = NULL;
rec = logend = logdata + st.st_size; rec = logend = logdata + st.st_size;
while (logdata < rec) { while (logdata < rec) {
reccnt++;
if (logdata < rec && *(rec-1) == '\n') if (logdata < rec && *(rec-1) == '\n')
rec--; rec--;
lastgt = NULL; lastgt = NULL;
@ -1087,8 +1088,12 @@ int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *
if (get_sha1_hex(logdata, sha1)) if (get_sha1_hex(logdata, sha1))
die("Log %s is corrupt.", logfile); die("Log %s is corrupt.", logfile);
munmap((void*)logdata, st.st_size); munmap((void*)logdata, st.st_size);
if (at_time)
fprintf(stderr, "warning: Log %s only goes back to %s.\n", fprintf(stderr, "warning: Log %s only goes back to %s.\n",
logfile, show_rfc2822_date(date, tz)); logfile, show_rfc2822_date(date, tz));
else
fprintf(stderr, "warning: Log %s only has %d entries.\n",
logfile, reccnt);
return 0; return 0;
} }
@ -1116,3 +1121,4 @@ void for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data)
} }
fclose(logfp); fclose(logfp);
} }