On Fri, Apr 06, 2012 at 02:02:56PM -0700, Junio C Hamano wrote:
> * rs/commit-list-sort-in-batch (2012-04-02) 3 commits
> - revision: insert unsorted, then sort in prepare_revision_walk()
> - commit: use mergesort() in commit_list_sort_by_date()
> - add mergesort() for linked lists
Looks like you applied these patches right on v1.7.9. However, they need
Thomas's 5e8617f to compile, which comes later. There's no textual
conflict, but test-mergesort.c need strbuf_getwholeline_fd, which is
made public by 5e8617f.
However, I don't think there's any reason to prefer the fd version over
the stdio one (in fact, it is much less efficient). So this could be
squashed in to the first patch instead of rebasing:
diff --git a/test-mergesort.c b/test-mergesort.c
index 02441ab..1dd82fd 100644
--- a/test-mergesort.c
+++ b/test-mergesort.c
@@ -28,7 +28,7 @@ int main(int argc, const char **argv)
struct strbuf sb = STRBUF_INIT;
for (;;) {
- if (strbuf_getwholeline_fd(&sb, 0, '\n'))
+ if (strbuf_getwholeline(&sb, stdin, '\n'))
break;
line = xmalloc(sizeof(struct line));
line->text = strbuf_detach(&sb, NULL);
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html