On Fri, Feb 07, 2020 at 06:11:27PM +0100, Sebastien Marie wrote:
> Hi,
> 
> I just found a reproductible segfault while using 'got backout'.
> 
> $ git clone --bare https://github.com/semarie/rust-ports
> $ got checkout rust-ports.git
> $ cd rust-ports
> $ got update -c 67c4a2936aa4a85b7ddc4ee009241b69e7cfda4f
> $ got backout d4a757173ee4fb1762b1dd373f1d508175846c8f
> G  Makefile
> G  distinfo
> Segmentation fault (core dumped)
> 

LOL, I think I was just being blind or thick or something (thick). It
looks like the wrong path is being sent. Based on this output from the
diff below, is this the desired result? If so, should a test be added?

stef$ got update -c 67c4a2936aa4a85b7ddc4ee009241b69e7cfda4f
U  Makefile
U  distinfo
U  patches/patch-src_bootstrap_bootstrap_py
D  patches/patch-src_librustc_target_spec_i586_unknown_openbsd_rs
A  patches/patch-src_librustc_target_spec_i686_unknown_openbsd_rs
D  patches/patch-src_librustc_target_spec_mod_rs
A  patches/patch-src_test_ui_sse2_rs
A  patches/patch-vendor_serde_build_rs
Updated to commit 67c4a2936aa4a85b7ddc4ee009241b69e7cfda4f
stef$ got backout d4a757173ee4fb1762b1dd373f1d508175846c8f
G  Makefile
G  distinfo
!  patches/patch-src_librustc_target_spec_i586_unknown_openbsd_rs
G  patches/patch-src_librustc_target_spec_i686_unknown_openbsd_rs
!  patches/patch-src_librustc_target_spec_mod_rs
G  patches/patch-src_test_ui_sse2_rs
G  patches/patch-vendor_serde_build_rs
Backed out commit d4a757173ee4fb1762b1dd373f1d508175846c8f
stef$ got up
U  Makefile
U  distinfo
U  patches/patch-src_bootstrap_bootstrap_py
A  patches/patch-src_librustc_target_spec_i586_unknown_openbsd_rs
D  patches/patch-src_librustc_target_spec_i686_unknown_openbsd_rs
A  patches/patch-src_librustc_target_spec_mod_rs
D  patches/patch-src_test_ui_sse2_rs
D  patches/patch-vendor_serde_build_rs
Updated to commit da5165f18934b5e44abe5da2ec2551c95fb959d0

-- 

Tracey Emery

diff 992eb9d8966327c12d7e3812a2cae527f621e4ba /home/basepr1me/src/got
blob - 17a07a2e89038439f7620a85b41050549a954ea8
file + lib/worktree.c
--- lib/worktree.c
+++ lib/worktree.c
@@ -2110,7 +2110,7 @@ merge_file_cb(void *arg, struct got_blob_object *blob1
 		    strlen(path1));
 		if (ie == NULL)
 			return (*a->progress_cb)(a->progress_arg,
-			    GOT_STATUS_MISSING, path2);
+			    GOT_STATUS_MISSING, path1);
 
 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
 		    path1) == -1)