git log -g: Complain, but do not fail, when no reflogs are there

dscho · gitster · commit 7b69b873faf3 · 2007-07-24T17:28:10.000-07:00
When asking "git log -g --all", clearly you want to see only those refs
that do have reflogs, but you do not want it to fail, either.

So instead of die()ing, complain about it, but move on to the other refs.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/reflog-walk.c b/reflog-walk.c
@@ -136,7 +136,7 @@ void init_reflog_walk(struct reflog_walk_info** info)
 	*info = xcalloc(sizeof(struct reflog_walk_info), 1);
 }
 
-void add_reflog_for_walk(struct reflog_walk_info *info,
+int add_reflog_for_walk(struct reflog_walk_info *info,
 		struct commit *commit, const char *name)
 {
 	unsigned long timestamp = 0;
@@ -188,7 +188,7 @@ void add_reflog_for_walk(struct reflog_walk_info *info,
 			}
 		}
 		if (!reflogs || reflogs->nr == 0)
-			die("No reflogs found for '%s'", branch);
+			return -1;
 		path_list_insert(branch, &info->complete_reflogs)->util
 			= reflogs;
 	}
@@ -200,13 +200,14 @@ void add_reflog_for_walk(struct reflog_walk_info *info,
 		if (commit_reflog->recno < 0) {
 			free(branch);
 			free(commit_reflog);
-			return;
+			return -1;
 		}
 	} else
 		commit_reflog->recno = reflogs->nr - recno - 1;
 	commit_reflog->reflogs = reflogs;
 
 	add_commit_info(commit, commit_reflog, &info->reflogs);
+	return 0;
 }
 
 void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
diff --git a/reflog-walk.h b/reflog-walk.h
@@ -2,7 +2,7 @@
 #define REFLOG_WALK_H
 
 extern void init_reflog_walk(struct reflog_walk_info** info);
-extern void add_reflog_for_walk(struct reflog_walk_info *info,
+extern int add_reflog_for_walk(struct reflog_walk_info *info,
 		struct commit *commit, const char *name);
 extern void fake_reflog_parent(struct reflog_walk_info *info,
 		struct commit *commit);
diff --git a/revision.c b/revision.c
@@ -118,10 +118,11 @@ static void add_pending_object_with_mode(struct rev_info *revs, struct object *o
 {
 	if (revs->no_walk && (obj->flags & UNINTERESTING))
 		die("object ranges do not make sense when not walking revisions");
+	if (revs->reflog_info && obj->type == OBJ_COMMIT &&
+			add_reflog_for_walk(revs->reflog_info,
+				(struct commit *)obj, name))
+		return;
 	add_object_array_with_mode(obj, name, &revs->pending, mode);
-	if (revs->reflog_info && obj->type == OBJ_COMMIT)
-		add_reflog_for_walk(revs->reflog_info,
-				(struct commit *)obj, name);
 }
 
 void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ void init_reflog_walk(struct reflog_walk_info** info)`
`136`	`136`	`*info = xcalloc(sizeof(struct reflog_walk_info), 1);`
`137`	`137`	`}`
`138`	`138`
`139`		`-void add_reflog_for_walk(struct reflog_walk_info *info,`
	`139`	`+int add_reflog_for_walk(struct reflog_walk_info *info,`
`140`	`140`	`struct commit commit, const char name)`
`141`	`141`	`{`
`142`	`142`	`unsigned long timestamp = 0;`
`@@ -188,7 +188,7 @@ void add_reflog_for_walk(struct reflog_walk_info *info,`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`	`if (!reflogs \|\| reflogs->nr == 0)`
`191`		`- die("No reflogs found for '%s'", branch);`
	`191`	`+ return -1;`
`192`	`192`	`path_list_insert(branch, &info->complete_reflogs)->util`
`193`	`193`	`= reflogs;`
`194`	`194`	`}`
`@@ -200,13 +200,14 @@ void add_reflog_for_walk(struct reflog_walk_info *info,`
`200`	`200`	`if (commit_reflog->recno < 0) {`
`201`	`201`	`free(branch);`
`202`	`202`	`free(commit_reflog);`
`203`		`- return;`
	`203`	`+ return -1;`
`204`	`204`	`}`
`205`	`205`	`} else`
`206`	`206`	`commit_reflog->recno = reflogs->nr - recno - 1;`
`207`	`207`	`commit_reflog->reflogs = reflogs;`
`208`	`208`
`209`	`209`	`add_commit_info(commit, commit_reflog, &info->reflogs);`
	`210`	`+ return 0;`
`210`	`211`	`}`
`211`	`212`
`212`	`213`	`void fake_reflog_parent(struct reflog_walk_info info, struct commit commit)`
Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,11 @@ static void add_pending_object_with_mode(struct rev_info revs, struct object o`
`118`	`118`	`{`
`119`	`119`	`if (revs->no_walk && (obj->flags & UNINTERESTING))`
`120`	`120`	`die("object ranges do not make sense when not walking revisions");`
	`121`	`+ if (revs->reflog_info && obj->type == OBJ_COMMIT &&`
	`122`	`+ add_reflog_for_walk(revs->reflog_info,`
	`123`	`+ (struct commit *)obj, name))`
	`124`	`+ return;`
`121`	`125`	`add_object_array_with_mode(obj, name, &revs->pending, mode);`
`122`		`- if (revs->reflog_info && obj->type == OBJ_COMMIT)`
`123`		`- add_reflog_for_walk(revs->reflog_info,`
`124`		`- (struct commit *)obj, name);`
`125`	`126`	`}`
`126`	`127`
`127`	`128`	`void add_pending_object(struct rev_info revs, struct object obj, const char *name)`