Skip to content
  • Jeff King's avatar
    combine-diff: treat --dirstat like --stat · dac03b55
    Jeff King authored and Junio C Hamano's avatar Junio C Hamano committed
    
    
    Currently "--cc --dirstat" will show nothing for a merge.  Like
    --shortstat and --summary in the previous two patches, it probably makes
    sense to treat it like we do --stat, and show a stat against the
    first-parent.
    
    This case is less obviously correct than for --shortstat and --summary,
    as those are basically variants of --stat themselves. It's possible we
    could develop a multi-parent combined dirstat format, in which case we
    might regret defining this first-parent behavior. But the same could be
    said for --stat, and in the 12+ years of it showing first-parent stats,
    nobody has complained.
    
    So showing the first-parent dirstat is at least _useful_, and if we
    later develop a clever multi-parent stat format, we'd probably have to
    deal with --stat anyway.
    
    Signed-off-by: default avatarJeff King <peff@peff.net>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    dac03b55