Nicolas Pitre <nico@xxxxxxx> wrote: > Instead of having this code duplicated in multiple places, let's have > a common interface for progress display. If someday someone wishes to > display a cheezy progress bar instead then only one file will have to > be changed. > > Note: I left merge-recursive.c out since it has a strange notion of > progress as it apparently increase the expected total number as it goes. > Someone with more intimate knowledge of what that is supposed to mean > might look at converting it to the common progress interface. That disaster in merge-recursive.c is my fault. The progress meter there doesn't mean much of anything. Even on my slow as dirt Windows system I see the progress meter jump to the end as soon as we discover the number of files we have to chug though. So its always at 99%. About the only value it has is saying "Oh; I just found out there are 6,000 files deleted/renamed between the two branches, and I finished processing them. Oh; I just found out that was just an inner recursive merge, now there are actually 12,000 files deleted/renamed when you add in the final merge. OK, I'm done." I've been thinking about getting rid of it. -- Shawn. - 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