Hi Patrice, > Yes they really disappeared. You can see it with the following commits > in Texinfo: > > I did these two commits, each originally with its ChangeLog entry (you > can see that with the logs, they are automatically generated based on > the CHangeLog last entry): > https://cgit.git.savannah.gnu.org/cgit/texinfo.git/commit/?id=fabe2438e9d261f561c25f2ad27103fa9415ec99 > https://cgit.git.savannah.gnu.org/cgit/texinfo.git/commit/?id=ec28bdf6055cc0bcead4b38a1b2ac6a1aef27978 > > At the same time, Gavin did some commits too, that he pushed before me > (for example the "const for info" commits). > > Then I do a > git pull --rebase > > The ChangeLog entries disappeared completly from my two aforementionned > commits then. > > I readded them in a separate commit (I could amend or, here since there > are two commits, reset or modify, but I am lazy, and it helps showing > the issue with git-merge-changelog): > > https://cgit.git.savannah.gnu.org/cgit/texinfo.git/commit/?id=6e8b2a0d8cbaa4f78d05d9bab1f1d08db3b66b82
Indeed, given your workflow that generates the commit message from the ChangeLog entry, the ChangeLog entry must have been removed after-the-fact, and this points to git-merge-changelog as the culprit. An installation problem of git-merge-changelog can be excluded, since in this situation your 2 ChangeLog entries would have been left in place. > > guess that your /tmp or $TMPDIR is full. > > Does not seems so, I have plenty of room there. OK. * What's your "git --version"? * To help debugging this, can you trace the /usr/bin/git-merge-changelog executable? Run 'sudo trace /usr/bin/git-merge-changelog' with the attached scripts. * What if you build git-merge-changelog yourself (using the build instructions at the top of gnulib/lib/git-merge-changelog.c), instead of relying on the build from your distro? Bruno
trace.tar.gz
Description: application/compressed-tar
