A core dump occurred while trying to interactively apply (3-way) a series of patches from a mailbox. git version 2.20.1 Steps to reproduce: alex@polaris:~/slurm/source$ git am -3 -i ~/Downloads/6033-18.08-final-patchset-v2.patch Commit Body is: -------------------------- Use correct signed/unsiged types. Change a few variables in archiving to use the correct signed or unsigned type to avoid implicit casting. Bug 6033. -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: y Applying: Use correct signed/unsiged types. Commit Body is: -------------------------- Remove unused static variable high_buffer_size. It was set but never read. Bug 6033. -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: y Applying: Remove unused static variable high_buffer_size. Commit Body is: -------------------------- Handle duplicate archive file names. The time period of the archive file currently depends on submit or start time and whether the purge period is in hours, days, or months. Previously, if the archive file name already exists, we would overwrite the old archive file with the assumption that these are duplicate records being archived after an archive load. However, that could result in lost records in a couple of ways: * If there were runaway jobs that were part of an old archive file's time period and are later fixed and then purged, the old file would be overwritten. * If jobs or steps are purged but there are still jobs or steps in that time period that are pending or running, the pending or running jobs and steps won't be purged. When they finish and are purged, the old file would be overwritten. Instead of overwriting the old file, we append a number to the file name to create a new file. This will also be important in an upcoming commit. Bug 6033. -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: y Applying: Handle duplicate archive file names. Using index info to reconstruct a base tree... M NEWS Falling back to patching base and 3-way merge... Auto-merging NEWS CONFLICT (content): Merge conflict in NEWS error: Failed to merge in the changes. Patch failed at 0003 Handle duplicate archive file names. hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am -i --continue". If you prefer to skip this patch, run "git am -i --skip" instead. To restore the original branch and stop patching, run "git am -i --abort". alex@polaris:~/slurm/source$ vi NEWS alex@polaris:~/slurm/source$ man git add alex@polaris:~/slurm/source$ git add -u alex@polaris:~/slurm/source$ git am -i --continue Applying: Handle duplicate archive file names. error: object 861d3c6f689a3ca5eb5fb5c409d46de0ad5555e1 is a commit, not a tree BUG: diff-lib.c:526: run_diff_index must be passed exactly one tree Aborted (core dumped) alex@polaris:~/slurm/source$
