Subject: Re: [PATCH Cogito] Make use of external editor work like CVS

From: Marcel Holtmann <[email-masked]>
Date: Sun, 08 May 2005 19:40:34 +0200

Hi Petr,

> > Sometime you don't have any other choice, because diff is not perfect.
> > Do you wanna apply that patch or should I change the mktemp templates
> > first?
> 
> It looks like it'll be most painless when I just reinvent parts of your
> patch here locally and you can send me patches on top of that.

it is your choice. I can change that if you like. My latest version
should apply cleanly against your current tree.

> > > > > > Index: cg-commit
> > > > > > ===================================================================
> > > > > > --- f00d7589973e8ea65d2264f5fbac82e1b217dc8f/cg-commit  (mode:100755)
> > > > > > +++ cb61efa8a01400150162af9b0f3773f21d502fe9/cg-commit  (mode:100755)
> > > > > > @@ -94,30 +78,55 @@
> > > > > >  		echo "$uri" >>$LOGMSG
> > > > > >  		[ "$msgs" ] && echo "$uri"
> > > > > >  	done
> > > > > > -	echo >>$LOGMSG
> > > > > > +else
> > > > > > +	first=1
> > > > > >  fi
> > > > > > -first=1
> > > > > > +
> > > > > >  for msg in "${msgs[@]}"; do
> > > > > >  	if [ "$first" ]; then
> > > > > >  		first=
> > > > > >  	else
> > > > > >  		echo >>$LOGMSG
> > > > > >  	fi
> > > > > > -	echo $msg | fmt >>$LOGMSG
> > > > > > +	echo $msg | fmt -s -w 74 >>$LOGMSG
> > > > > >  done
> > > > > > +
> > > > > > +if [ "$first" ]; then
> > > > > > +	echo >>$LOGMSG
> > > > > > +fi
> > > > > 
> > > > > This mess is still here.
> > > > 
> > > > That is not mess. Think about it. If we have messages provided by -m we
> > > > want an empty line between the merge message and the the first commit
> > > > message. And we don't wanna have an extra empty line at the top if you
> > > > provide a commit messages via -m.
> > > 
> > > But, that's the current behaviour, isn't it?
> > 
> > No it is not, because with my change the messages are at the top and
> > before the CG: lines.
> 
> I'm sorry but I still don't get what are you trying to say. :-)
> As far as I can see, the output will be the same, except that with to -m
> arguments, there won't be the extra newline for the merge message - and
> we agreed we want it, didn't we?

The -m has nothing to do with the merge message. You can have one of
them, but also both. Maybe I missed something in your latest changes.

If you want the extra newline(s) then it is a good idea to add something
that strips heading and trailing empty lines from the final commit
message, because otherwise it will be ugly if you don't enter extra text
for the merge.

Regards

Marcel