Re: git-rebase nukes multiline comments

From: David Kowis <dkowis@shlrm.org>
Date: Jun 16, 2006, 17:23 UTC
Message-ID: <4492E8F9.4000106@shlrm.org>
In-Reply-To: <20060616171251.GA29820@suse.de>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Matthias Hopf wrote:

Show 35 quoted lines

> Hi all,
> 
> I'm using git-1.2.4 on SL10.1, in centralized style development (for X.org).
> 
> I wanted to commit a set of changes (4 local commits) upstream, so I had
> to do a git-rebase first (in that particular case a git-pull would have
> been possible as well, but git-rebase fits the CVS style development
> better). After git-fetch, git-rebase origin, and git-push all my changes
> had only the first line of the changelog comment, the remainder was
> nuked.
> 
> To reproduce:
> 
> mkdir /var/tmp/blaup
> cd /var/tmp/blaup
> git-init-db
> echo test > foo
> git-add foo
> git-commit      (any comment)
> cd ..
> git-clone /var/tmp/blaup bla
> cd bla
> echo test2 >>foo 
> git-commit foo  (multiline comment)
> cd ../blaup
> echo test3 >bar
> git-add bar
> git-commit      (any comment)
> cd ../bla
> git-fetch
> git-log         (shows multiline comment for 'test2')
> git-rebase origin
> git-log         (shows only the first line of the multiline comment!)
> 
>

I'm new to git, but I tried what you said.
my git log:
commit c846bea8c61bec7cf0f7688c48abc42577b9ac7f
Author: David Kowis <dkowis@kain.org>
Date:   Fri Jun 16 12:20:08 2006 -0500

    this is a multi

    line comment
    with three lines

I'm using git 1.4.0. It added a blank line in there...

David Kowis

ISO Team Lead - www.sourcemage.org Source Mage GNU/Linux

Progress isn't made by early risers. It's made by lazy men trying to
find easier ways to do something.
  - Robert Heinlein
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)

iQGVAwUBRJLo+cnf+vRw63ObAQomewv+L18ogJHgx3jQPt/B+K84GIAX5SugrSnZ ASC2jm/sbMdidU1goOepXILw2DBOWKSpuDwTZXE0uDrldMTK4RW/2dDACbGVEQX/ Ter4cclIxNztaAwzXGHqKyOI24c5jQmlzW+yDcnErJZTexDA6xyp4xVZlySJpZev tzfj1Di/uYNJ83lcgS9ID64JToZ5sYZjeqy5HjfEpEQR7xHSYoaR94LNjSHMrqU8 S32ryCMeBSX9SWP8lX7lv6YzIlPGYbOVIsskANVN4GyYVdoMXyXpNtDvziIXrxJj FkSCloMq5bzVuykthPer0FQRXiySyM1bWsUt9i7Xf3fF8qzyVpIJghP3GAlwh4Gs LRefaUkkVH61FmN+Uw65xxdx99L4ABoZJDpPBhQdOnY+BXbhNGM5p/lAi3iX72Bx eIMmaWiwxF8XlIaLJFbDVtGA7lwJzneQQUyHHlTZhzu+VXf4ulKPE93NKEuWWqnL FD9Tgmu5sFANq5iKSCyocvyAqiWljR8w =hQWx -----END PGP SIGNATURE-----