[PATCH] format-patch: use clear_commit_marks() instead of some adhocery
It is cleaner, and it describes better what is the idea behind the code.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---
On Mon, 26 Jun 2006, Junio C Hamano wrote:
> I'll be pushing out a new test for format-patch shortly in
> "next".
... and this test fails with my original patch: We also need to
reset ADDED, and I threw in SHOWN for good measure.
Maybe there is room for improvement of the revision walker here;
It smells a little like ADDED is not only used to avoid duplicate
parsing (which I guess is now happening, even with
reset_all_objects_flags() instead of clear_commit_marks()), but
also to decide if the revision walker should walk on.
We are getting more and more users of the revision walker, and this
is just the first to call the walker more than once.
builtin-log.c | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/builtin-log.c b/builtin-log.c
index 4ee5891..f9515a8 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -160,15 +160,6 @@ static void reopen_stdout(struct commit
freopen(filename, "w", stdout);
}
-static void reset_all_objects_flags()
-{
- int i;
-
- for (i = 0; i < obj_allocs; i++)
- if (objs[i])
- objs[i]->flags = 0;
-}
-
static int get_patch_id(struct commit *commit, struct diff_options *options,
unsigned char *sha1)
{
@@ -220,7 +211,10 @@ static void get_patch_ids(struct rev_inf
}
/* reset for next revision walk */
- reset_all_objects_flags();
+ clear_commit_marks((struct commit *)o1,
+ SEEN | UNINTERESTING | SHOWN | ADDED);
+ clear_commit_marks((struct commit *)o2,
+ SEEN | UNINTERESTING | SHOWN | ADDED);
o1->flags = flags1;
o2->flags = flags2;
}
--
1.4.1.rc1.g9de8f-dirty
Johannes Schindelin <johannes.schindelin@gmx.de>