Thread (4 messages) flat view 4 messages, 3 authors, 2016-06-15

Re: [PATCH] git-rebase--interactive: Handle commit messages that end in backslash

From: Thomas Rast <hidden>
Date: 2016-06-15 22:48:48

Jeff King wrote:
As I understand it[1], the subject line shown is for
human consumption only, and the actual operations happen on the included
sha1. So we could munge it in a non-reversible way without breaking
anything.

-Peff

[1] I may be wrong. This is not code I'm too familiar with, and I do
remember a proposal at some point for automagically handling subjects
with "wip" or "squash" in them. Still, a light munging may work.
During the actual rebasing, only the 'cmd sha' portion of the line
matters, as evidenced by the code doing

  do_next () {
          rm -f "$MSG" "$AUTHOR_SCRIPT" "$AMEND" || exit
          read command sha1 rest < "$TODO"

and then not using $rest except in status messages.

The automatic handling you are referring to is --autosquash, which
happens in rearrange_squash() which is a preprocessing stage.  AFAICS
that function is still okay iff the munging maps prefixes to prefixes.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help