From 8780bd8fd2fb9a85c39de8d7d3105b94c6a9cf40 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 27 Jun 2006 10:12:12 +0200 Subject: [PATCH 1/2] t4014: fix for whitespace from "wc -l" Some "wc" insist on putting a TAB in front of the number. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- t/t4014-format-patch.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index c044044f80..ac2fde773d 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -37,7 +37,7 @@ test_expect_success "format-patch --ignore-if-in-upstream" ' git format-patch --stdout master..side >patch0 && cnt=`grep "^From " patch0 | wc -l` && - test "$cnt" = 3 + test $cnt = 3 ' @@ -46,7 +46,7 @@ test_expect_success "format-patch --ignore-if-in-upstream" ' git format-patch --stdout \ --ignore-if-in-upstream master..side >patch1 && cnt=`grep "^From " patch1 | wc -l` && - test "$cnt" = 2 + test $cnt = 2 ' @@ -55,7 +55,7 @@ test_expect_success "format-patch result applies" ' git checkout -b rebuild-0 master && git am -3 patch0 && cnt=`git rev-list master.. | wc -l` && - test "$cnt" = 2 + test $cnt = 2 ' test_expect_success "format-patch --ignore-if-in-upstream result applies" ' @@ -63,7 +63,7 @@ test_expect_success "format-patch --ignore-if-in-upstream result applies" ' git checkout -b rebuild-1 master && git am -3 patch1 && cnt=`git rev-list master.. | wc -l` && - test "$cnt" = 2 + test $cnt = 2 ' test_done From 81db094107df9a73a0be4538a74a26115a84dd13 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 27 Jun 2006 22:38:04 +0200 Subject: [PATCH 2/2] format-patch: use clear_commit_marks() instead of some ad-hockery It is cleaner, and it describes better what the idea behind the code is. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- builtin-log.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/builtin-log.c b/builtin-log.c index 4ee5891dfd..f9515a8a4a 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -160,15 +160,6 @@ static void reopen_stdout(struct commit *commit, int nr, int keep_subject) 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_info *rev, struct diff_options *options) } /* 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; }