Next round :-) I only changed 3/5, as per your comments: Jeff King wrote: > On Fri, Oct 16, 2009 at 12:41:46AM +0200, Thomas Rast wrote: > > +- '%gD': reflog selector, e.g., `refs/stash@{1}` > > +- '%gd': shortened reflog selector, e.g., `stash@{1}` > > +- '%gs': reflog subject > > Should we give a note that these do nothing if "-g" was not given? I tried for some time, but all attempts at interrupting the lists ended up terminating it again, so that the %g family list would not line up with the rest of the parameters. Having the note there would be nice, but I think keeping the list together optically is more important. However, AFAICS it really is the first character that only works with certain options (%m makes little sense without A...B, but still expands to >). Looking at it did make me notice that @{1} is invalid asciidoc and needs to be spelled @\{1\} though :-) > A test for '%gd' would be nice. A squashable one is below. I am tempted > to test all three forms in t6006, since the intent of that script is to > test all format specifiers. However, those tests would be somewhat > redundant with your t1411 tests. I added yours and moved my tests to t6006 too, as indicated in the other mail. I also changed the caching, as outlined earlier: I wrote: > I had a slightly better idea today: We can just put an extra member > into the complete_reflogs struct, i.e., a short_ref to go along with > the ref. It'll take a bit of auditing to verify that all allocations > are zeroed, but since the struct is local to the file that shouldn't > be so hard. There's in fact only a single allocation (with xcalloc). Thomas Rast (5): Refactor pretty_print_commit arguments into a struct reflog-walk: refactor the branch@{num} formatting Introduce new pretty formats %g[sdD] for reflog information stash list: use new %g formats instead of sed stash list: drop the default limit of 10 stashes Documentation/pretty-formats.txt | 3 + builtin-branch.c | 3 +- builtin-checkout.c | 3 +- builtin-log.c | 3 +- builtin-merge.c | 7 ++- builtin-rev-list.c | 7 ++- builtin-shortlog.c | 9 +++- builtin-show-branch.c | 4 +- commit.h | 20 ++++++--- git-stash.sh | 8 +--- log-tree.c | 21 +++++----- pretty.c | 44 ++++++++++++++------ reflog-walk.c | 83 ++++++++++++++++++++++++++++---------- reflog-walk.h | 8 ++++ t/t6006-rev-list-format.sh | 18 ++++++++ 15 files changed, 170 insertions(+), 71 deletions(-) -- 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