list mirror (unofficial, one of many)
 help / color / mirror / Atom feed
* Abort (core dumped)
@ 2019-05-20  8:35 Alejandro Sanchez
  2019-05-20 10:02 ` Jeff King
  0 siblings, 1 reply; 18+ messages in thread
From: Alejandro Sanchez @ 2019-05-20  8:35 UTC (permalink / raw)
  To: git

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
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...
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)

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2019-09-26 21:11 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-20  8:35 Abort (core dumped) Alejandro Sanchez
2019-05-20 10:02 ` Jeff King
2019-05-20 12:06   ` [PATCH 0/4] fix BUG() with "git am -i --resolved" Jeff King
2019-05-20 12:07     ` [PATCH 1/4] am: simplify prompt response handling Jeff King
2019-05-20 12:09     ` [PATCH 2/4] am: read interactive input from stdin Jeff King
2019-05-20 12:11     ` [PATCH 3/4] am: drop tty requirement for --interactive Jeff King
2019-05-20 12:50       ` Jeff King
2019-05-23  6:44         ` Johannes Schindelin
2019-05-24  6:27           ` Jeff King
2019-05-20 12:13     ` [PATCH 4/4] am: fix --interactive HEAD tree resolution Jeff King
2019-05-23  7:12       ` Johannes Schindelin
2019-05-24  6:39         ` Jeff King
2019-05-24  6:46           ` [PATCH v2 " Jeff King
2019-05-28 11:06           ` [PATCH " Johannes Schindelin
2019-05-28 21:35             ` Jeff King
2019-05-29 11:56               ` Johannes Schindelin
2019-09-26 14:20                 ` Alejandro Sanchez
2019-09-26 21:11                   ` Jeff King list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ \
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
 note: .onion URLs require Tor:

code repositories for the project(s) associated with this inbox:

AGPL code for this site: git clone