-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 According to Bruno Haible on 7/2/2009 5:17 PM: > Now, can you show me a crashing situation, please (with either the old or the > new git-merge-changelog)?
Found one. This crashes under the old: $ git clone git://git.sv.gnu.org/m4.git $ cd m4 $ git reset --hard 0b17f4 # on branch-1.6 $ git config merge.merge-changelog.driver git-merge-changelog --split-merged-entry %O %A %B $ GIT_TRACE=2 git cherry-pick -x cd172d9 trace: built-in: git 'cherry-pick' '-x' 'cd172d9' trace: run_command: 'sh' '-c' 'git-merge-changelog --split-merged-entry .merge_file_FrP9zj .merge_file_vkrkds .merge_file_eQYSBK' fatal: Failed to execute internal merge This time, git removes the temporary .merge_file_*, but I confirmed that they can be recreated via: $ git show 5f008b:ChangeLog > file1 $ git show 0b17f4:ChangeLog > file2 $ git show cd172d:ChangeLog > file3 $ git-merge-changelog --split-merged-entry file[123] - -- Don't work too hard, make some time for fun as well! Eric Blake e...@byu.net -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Cygwin) Comment: Public key at home.comcast.net/~ericblake/eblake.gpg Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkpNZGwACgkQ84KuGfSFAYDzLwCgxG86DZwfSUjnnihubVz7qkFo QYEAnRmKazEZsziaQkRyBOQX4X0C3N7S =oegA -----END PGP SIGNATURE-----
