Mike Rappazzo <rappazzo@xxxxxxxxx> writes:
> I find that If I am doing a rebase with the intention to squash or
> re-order commits, it is helpful to know the commit author.
There is not a fundamental reason why the remainder of the line
after the object name in the rebase insn sheet should not be
customizable, and I think your patch is a good first step to
identify where that customization should go.
But that is a customization issue, not changing the default and the
only format used.
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index dc3133f..ec44d41 100644
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -977,7 +977,7 @@ else
> revisions=$onto...$orig_head
> shortrevisions=$shorthead
> fi
> -git rev-list $merges_option --pretty=oneline --reverse --left-right
> --topo-order \
> +git rev-list $merges_option --pretty="%m%h [%an] %x09%s" --reverse
> --left-right --topo-order \
> $revisions ${restrict_revision+^$restrict_revision} | \
> sed -n "s/^>//p" |
> while read -r sha1 rest
This is nothing new, and it may not even be a problem, but why do we
use --left-right and then filter with sed? Does this part of the
code predate --left-only, I wonder. I'd probably write
git log --format="%h %s" --left-only .....
with today's Git, but perhaps I am missing something?
> The problem, as I see it is that the original '--pretty=oneline' only
> produces a single line of output (of course). However, the changed
> version '--pretty="%m%h [%an] %x09%s"' produces multiple lines.
Shouldn't you be using tformat, not format, if you are doing a
oneline emulation?
--
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