Commit ending in \ breaks rebase commitlog parsing

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,
Through typos on my part, I have a commit with a message ending in a \.

    Prefer ! and && to \\not\ and 'and\

The rebase command or something it is using is parsing this
incorrectly and leaving my .git in a "bad" state.

    pick 43d2369 Prefer ! and && to
    ot and 'and8c7ee99 Upgrade to Devel::PPPort-3.19

That should have read:

    pick 43d2369 Perefer ! and && to \\not\ and 'and\
    pick 8c7ee99 Upgrade to Devel::PPPort-3.19

Initially, I started editing my pick list to be proper and was
receiving some strange sort of parsing errors but now am not. I'd
manually edited the backup picklist file in .git as well. For a repro,
I tried the following. This also seems to show up a perhaps related
problem of a commit message consisting of only a single backslash. The
pick list just *drops* the commit, perhaps because some layer thinks
the commit message is empty?

    mkdir slash
    cd slash
    git init

    echo data1 > foo
    git add foo
    git commit -m root
    export PARENT=$(git rev-parse HEAD)

    echo data2 > foo
    git add foo
    git commit -m \\

    echo data3 > foo
    git add foo
    git commit -m next

    git rebase -i $PARENT
    # .git/rebase-merge/git-rebase-todo is now incorrect

Josh
--
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


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]