Test failures when building in Nix

[hmenke]

Hi,

I'm trying to update the version of git-branchless in nixpkgs from 0.3.2 to 0.3.6 but I'm meeting some unexpected difficulties. For reference, the packaging script is shown below in default.nix.

1. One of the tests uses cat in the hook:

   git-branchless/src/git/run.rs

   Lines 328 to 330 in d75cb2d

   	# This won't work unless we're running the hook in the Git working copy.
   	echo "Contents of test1.txt:"
   	cat test1.txt

   However, cat is not in the PATH because the environment is cleared and subsequently only contains git here

   git-branchless/src/testing.rs

   Lines 212 to 216 in d75cb2d

   	command
   	.args(&args)
   	.env_clear()
   	.envs(base_env.iter().copied())
   	.envs(env.iter());

   I'm actually quite surprised that this does not seem to be a problem on other platforms and I don't even understand why it works. Is there something like an implicit PATH that is always searched? Anyway, with the patch 0001-fix-testing-add-cat-to-get_path_for_env.patch it works in the Nix sandbox as well.

2. There are four remaining tests which panic with what seems to be Invalid cross-device link (os error 18). Now I'm not too well-versed in reading rust backtraces, so I don't really know what this means or where this comes from.

Can you please help me pass the tests?

default.nix

{ lib
, fetchFromGitHub
, git
, libiconv
, ncurses
, openssl
, pkg-config
, rustPlatform
, sqlite
, stdenv
, Security
, SystemConfiguration
}:

rustPlatform.buildRustPackage rec {
  pname = "git-branchless";
  version = "0.3.6";

  src = fetchFromGitHub {
    owner = "arxanas";
    repo = "git-branchless";
    rev = "v${version}";
    sha256 = "15x0y6qn3xwf31522r05qxgqi3qhkxb7vljiyw8m9xy0sm9ahyzr";
  };

  cargoSha256 = "05rq50lw5v0bnr0xnyd2ifgvx0k21147w95999zasffdz3h2c2s8";

  patches = [ ./0001-fix-testing-add-cat-to-get_path_for_env.patch ];

  nativeBuildInputs = [ pkg-config ];

  buildInputs = [
    ncurses
    openssl
    sqlite
  ] ++ lib.optionals (stdenv.isDarwin) [
    Security
    SystemConfiguration
    libiconv
  ];

  preCheck = ''
    export RUST_BACKTRACE=1
    export PATH_TO_GIT=${git}/bin/git
    export GIT_EXEC_PATH=$(${git}/bin/git --exec-path)
  '';

  meta = {
    description = "A suite of tools to help you visualize, navigate, manipulate, and repair your commit history";
    homepage = "https://github.com/arxanas/git-branchless";
    license = lib.licenses.gpl2Only;
    maintainers = with lib.maintainers; [ msfjarvis nh2 hmenke ];
  };
}

0001-fix-testing-add-cat-to-get_path_for_env.patch

From e1f8071dcebb21e998d12aee23c005ba0068af15 Mon Sep 17 00:00:00 2001
From: Henri Menke <[email protected]>
Date: Thu, 14 Oct 2021 11:27:53 +0200
Subject: [PATCH] fix(testing): add cat to get_path_for_env
---
 src/testing.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/testing.rs b/src/testing.rs
index 75a9e64..33fba36 100644
--- a/src/testing.rs
+++ b/src/testing.rs
@@ -10,7 +10,7 @@ use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 
 use crate::git::{GitRunInfo, GitVersion, NonZeroOid, Repo};
-use crate::util::get_sh;
+use crate::util::{get_sh, get_from_path};
 
 use color_eyre::Help;
 use eyre::{eyre, Context};
@@ -157,6 +157,8 @@ impl Git {
             .expect("Unable to find git-branchless path parent");
         let bash = get_sh().expect("bash missing?");
         let bash_path = bash.parent().unwrap();
+        let cat = get_from_path("cat").expect("coreutils missing?");
+        let cat_path = cat.parent().unwrap();
         std::env::join_paths(
             vec![
                 // For Git to be able to launch `git-branchless`.
@@ -165,6 +167,8 @@ impl Git {
                 self.get_git_exec_path().as_os_str(),
                 // For branchless to manually invoke bash when needed.
                 bash_path.as_os_str(),
+                // Some hook tests require `cat`.
+                cat_path.as_os_str(),
             ]
             .into_iter(),
         )
-- 
2.33.0

build.log

these derivations will be built:
  /nix/store/2zpcwnljxylpikadwl97i4xi15dg3151-git-branchless-0.3.6.drv
building '/nix/store/2zpcwnljxylpikadwl97i4xi15dg3151-git-branchless-0.3.6.drv'...
unpacking sources
unpacking source archive /nix/store/gkb84llqwd82540zmcq77v1bpz6022gg-source
source root is source
Executing cargoSetupPostUnpackHook
unpacking source archive /nix/store/6v2v169gifm13j9pnxpxsqv1kzaw8vgx-git-branchless-0.3.6-vendor.tar.gz
Finished cargoSetupPostUnpackHook
patching sources
applying patch /nix/store/m988wwrms58jah0a4gfpxibwaaxla13i-0001-fix-testing-add-cat-to-get_path_for_env.patch
patching file src/testing.rs
Hunk #1 succeeded at 11 (offset 1 line).
Hunk #2 succeeded at 151 (offset -6 lines).
Hunk #3 succeeded at 161 (offset -6 lines).
Executing cargoSetupPostPatchHook
Validating consistency between /build/source//Cargo.lock and /build/git-branchless-0.3.6-vendor.tar.gz/Cargo.lock
Finished cargoSetupPostPatchHook
configuring
building
Executing cargoBuildHook
++ env CC_x86_64-unknown-linux-gnu=/nix/store/s5hkav7whndbfz0szshpb46h4idqdq9a-gcc-wrapper-10.3.0/bin/cc CXX_x86_64-unknown-linux-gnu=/nix/store/s5hkav7whndbfz0szshpb46h4idqdq9a-gcc-wrapper-10.3.0/bin/c++ CC_x86_64-unknown-linux-gnu=/nix/store/s5hkav7whndbfz0szshpb46h4idqdq9a-gcc-wrapper-10.3.0/bin/cc CXX_x86_64-unknown-linux-gnu=/nix/store/s5hkav7whndbfz0szshpb46h4idqdq9a-gcc-wrapper-10.3.0/bin/c++ cargo build -j 36 --target x86_64-unknown-linux-gnu --frozen --release
   Compiling libc v0.2.101
   Compiling autocfg v1.0.1
   Compiling cfg-if v1.0.0
   Compiling proc-macro2 v1.0.28
   Compiling unicode-xid v0.2.2
   Compiling syn v1.0.75
   Compiling lazy_static v1.4.0
   Compiling version_check v0.9.3
   Compiling once_cell v1.8.0
   Compiling pkg-config v0.3.19
   Compiling memchr v2.4.1
   Compiling serde_derive v1.0.129
   Compiling log v0.4.14
   Compiling serde v1.0.129
   Compiling smallvec v1.6.1
   Compiling regex-syntax v0.6.25
   Compiling scopeguard v1.1.0
   Compiling strsim v0.10.0
   Compiling ppv-lite86 v0.2.10
   Compiling crossbeam-utils v0.8.5
   Compiling pin-project-lite v0.2.7
   Compiling getrandom v0.1.16
   Compiling ryu v1.0.5
   Compiling fnv v1.0.7
   Compiling bitflags v1.3.2
   Compiling ident_case v1.0.1
   Compiling either v1.6.1
   Compiling tinyvec_macros v0.1.0
   Compiling unicode-width v0.1.8
   Compiling serde_json v1.0.66
   Compiling stable_deref_trait v1.2.0
   Compiling itoa v0.4.8
   Compiling matches v0.1.9
   Compiling maybe-uninit v2.0.0
   Compiling unicode-segmentation v1.8.0
   Compiling static_assertions v1.1.0
   Compiling anyhow v1.0.43
   Compiling percent-encoding v2.1.0
   Compiling ansi_term v0.12.1
   Compiling unicode-bidi v0.3.6
   Compiling remove_dir_all v0.5.3
   Compiling crossbeam-epoch v0.9.5
   Compiling cfg-if v0.1.10
   Compiling signal-hook v0.3.9
   Compiling rayon-core v1.9.1
   Compiling byteorder v1.4.3
   Compiling hex v0.4.3
   Compiling esl01-vlqencoding v0.1.0
   Compiling roff v0.1.0
   Compiling termcolor v1.1.2
   Compiling vec_map v0.8.2
   Compiling eyre v0.6.5
   Compiling predicates-core v1.0.2
   Compiling doc-comment v0.3.3
   Compiling gimli v0.25.0
   Compiling os_str_bytes v3.1.0
   Compiling openssl-probe v0.1.4
   Compiling quick-error v1.2.3
   Compiling adler v1.0.2
   Compiling xi-unicode v0.3.0
   Compiling esl01-drawdag v0.1.0
   Compiling treeline v0.1.0
   Compiling owo-colors v1.3.0
   Compiling indenter v0.3.3
   Compiling rustc-demangle v0.1.21
   Compiling difflib v0.4.0
   Compiling fallible-iterator v0.2.0
   Compiling number_prefix v0.4.0
   Compiling json v0.12.4
   Compiling fallible-streaming-iterator v0.1.9
   Compiling os_str_bytes v4.0.0
   Compiling path-slash v0.1.4
   Compiling instant v0.1.10
   Compiling tracing-core v0.1.19
   Compiling sharded-slab v0.1.3
   Compiling tinyvec v1.3.1
   Compiling lock_api v0.3.4
   Compiling lock_api v0.4.4
   Compiling owning_ref v0.4.1
   Compiling owning_ref v0.3.3
   Compiling textwrap v0.14.2
   Compiling thread_local v1.1.3
   Compiling itertools v0.8.2
   Compiling itertools v0.10.1
   Compiling form_urlencoded v1.0.1
   Compiling man v0.3.0
   Compiling heck v0.3.3
   Compiling humantime v1.3.0
   Compiling ahash v0.7.4
   Compiling proc-macro-error-attr v1.0.4
   Compiling proc-macro-error v1.0.4
   Compiling predicates-tree v1.0.3
   Compiling num-traits v0.2.14
   Compiling num-integer v0.1.44
   Compiling indexmap v1.7.0
   Compiling num-iter v0.1.42
   Compiling memoffset v0.6.4
   Compiling num-rational v0.4.0
   Compiling miniz_oxide v0.4.4
   Compiling rayon v1.5.1
   Compiling smallvec v0.6.14
   Compiling tracing-log v0.1.2
   Compiling crossbeam-channel v0.5.1
   Compiling unicode-normalization v0.1.19
   Compiling aho-corasick v0.7.18
   Compiling object v0.26.1
   Compiling quote v1.0.9
   Compiling crossbeam-deque v0.8.1
   Compiling getrandom v0.2.3
   Compiling time v0.1.43
   Compiling memmap v0.7.0
   Compiling parking_lot_core v0.7.2
   Compiling signal-hook-registry v1.4.0
   Compiling fs2 v0.4.3
   Compiling mio v0.7.13
   Compiling rand v0.4.6
   Compiling parking_lot_core v0.8.3
   Compiling num_cpus v1.13.0
   Compiling terminal_size v0.1.17
   Compiling atty v0.2.14
   Compiling wait-timeout v0.2.0
   Compiling predicates v2.0.2
   Compiling rand_core v0.6.3
   Compiling rand_core v0.5.1
   Compiling jobserver v0.1.24
   Compiling num-complex v0.4.0
   Compiling regex v1.5.4
   Compiling regex-automata v0.1.10
   Compiling parking_lot v0.10.2
   Compiling parking_lot v0.11.1
   Compiling idna v0.2.3
   Compiling rand_chacha v0.2.2
   Compiling rand_chacha v0.3.1
   Compiling cc v1.0.69
   Compiling hashbrown v0.11.2
   Compiling chrono v0.4.19
   Compiling signal-hook-mio v0.2.1
   Compiling parking_lot_core v0.2.14
   Compiling addr2line v0.16.0
   Compiling rand v0.7.3
   Compiling rand v0.8.4
   Compiling crossterm v0.20.0
   Compiling matchers v0.0.1
   Compiling lalrpop-util v0.19.6
   Compiling console v0.14.1
   Compiling url v2.2.2
   Compiling parking_lot v0.4.8
   Compiling hashlink v0.7.0
   Compiling num v0.4.0
   Compiling esl01-hgtime v0.1.0
   Compiling tempfile v3.2.0
   Compiling twox-hash v1.6.1
   Compiling indicatif v0.17.0-beta.1
   Compiling chashmap v2.2.2
   Compiling libz-sys v1.1.3
   Compiling openssl-sys v0.9.66
   Compiling libssh2-sys v0.2.21
   Compiling libgit2-sys v0.12.22+1.1.0
   Compiling backtrace v0.3.61
   Compiling libsqlite3-sys v0.22.2
   Compiling darling_core v0.13.0
   Compiling tracing-attributes v0.1.15
   Compiling thiserror-impl v1.0.26
   Compiling clap_derive v3.0.0-beta.4
   Compiling enum-map-derive v0.6.0
   Compiling darling_macro v0.13.0
   Compiling enum-map v1.1.1
   Compiling thiserror v1.0.26
   Compiling darling v0.13.0
   Compiling enumset_derive v0.5.5
   Compiling tracing v0.1.26
   Compiling clap v3.0.0-beta.4
   Compiling enumset v1.0.7
   Compiling cursive_core v0.3.0-alpha.0
   Compiling git2 v0.13.21
   Compiling cursive v0.17.0-alpha.0
   Compiling cursive_buffered_backend v0.6.0-alpha.0
   Compiling git-branchless v0.3.6 (/build/source)
   Compiling tracing-serde v0.1.2
   Compiling esl01-minibytes v0.2.0
   Compiling bstr v0.2.16
   Compiling esl01-indexedlog v0.1.2
   Compiling globset v0.4.8
   Compiling assert_cmd v2.0.0
   Compiling tracing-subscriber v0.2.20
   Compiling esl01-dag v0.2.1
   Compiling tracing-error v0.1.2
   Compiling tracing-chrome v0.3.1
   Compiling color-spantrace v0.1.6
   Compiling color-eyre v0.5.11
   Compiling gitdag v0.1.2
   Compiling gitrevset v0.2.0
   Compiling rusqlite v0.25.3
    Finished release [optimized] target(s) in 1m 56s
Executing cargoInstallPostBuildHook
Finished cargoInstallPostBuildHook
Finished cargoBuildHook
running tests
Executing cargoCheckHook
++ cargo test -j 36 --release --target x86_64-unknown-linux-gnu --frozen -- --test-threads=36
   Compiling semver v1.0.4
   Compiling plotters-backend v0.3.2
   Compiling linked-hash-map v0.5.4
   Compiling same-file v1.0.6
   Compiling half v1.7.1
   Compiling dtoa v0.4.8
   Compiling oorandom v11.1.3
   Compiling uuid v0.8.2
   Compiling similar v1.3.0
   Compiling textwrap v0.11.0
   Compiling csv-core v0.1.10
   Compiling tinytemplate v1.2.1
   Compiling walkdir v2.3.2
   Compiling clap v2.33.3
   Compiling yaml-rust v0.4.5
   Compiling serde_cbor v0.11.2
   Compiling csv v1.1.6
   Compiling plotters-svg v0.3.1
   Compiling plotters v0.3.1
   Compiling serde_yaml v0.8.20
   Compiling rustc_version v0.4.0
   Compiling cast v0.2.7
   Compiling insta v1.7.2
   Compiling criterion-plot v0.4.4
   Compiling criterion v0.3.5
   Compiling git-branchless v0.3.6 (/build/source)
    Finished release [optimized] target(s) in 32.92s
     Running unittests (target/x86_64-unknown-linux-gnu/release/deps/branchless-1a868d289bd735d7)

running 19 tests
test commands::init::tests::test_all_alias_binaries_exist ... ok
test commands::init::tests::test_update_between_lines ... ok
test core::metadata::tests::test_describe_time_delta ... ok
test git::repo::tests::test_parse_git_version_output ... ok
test core::metadata::tests::test_extract_diff_number ... ok
test tui::effects::tests::test_effects_progress ... ok
test core::eventlog::tests::test_drop_non_meaningful_events ... ok
test commands::hooks::tests::test_parse_reference_transaction_line ... ok
test core::eventlog::tests::test_advance_cursor_by_transaction ... ok
test commands::undo::tests::test_optimize_inverse_events ... ok
test commands::wrap::tests::test_wrap_explicit_git_executable ... ok
test git::tree::tests::test_detect_path_only_changed_file_mode ... ok
test core::eventlog::tests::test_different_event_transaction_ids ... ok
test git::tree::tests::test_hydrate_tree ... ok
test git::run::tests::test_hook_working_dir ... ok
test git::repo::tests::test_cherry_pick_fast ... ok
test core::rewrite::evolve::tests::test_find_rewrite_target ... ok
test commands::wrap::tests::test_wrap_rebase_in_transaction ... ok
test commands::hooks::tests::test_is_rebase_underway ... ok

test result: ok. 19 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.29s

     Running unittests (target/x86_64-unknown-linux-gnu/release/deps/git_branchless-db78b479276a849f)

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s

     Running tests/mod.rs (target/x86_64-unknown-linux-gnu/release/deps/mod-0f349bf7b46934d1)

running 88 tests
test command::test_init::test_old_git_version_warning ... ok
test command::test_init::test_hook_installed ... ok
test command::test_init::test_init_basic ... ok
test command::test_init::test_init_uninstall ... ok
test command::test_init::test_alias_installed ... ok
test command::test_init::test_init_prompt_for_main_branch ... ok
test command::test_hide::test_hide_bad_commit ... ok
test command::test_init::test_main_branch_not_found_error_message ... ok
test command::test_hide::test_hide_current_commit ... ok
test command::test_hide::test_hide_already_hidden_commit ... ok
test command::test_navigation::test_prev ... ok
test command::test_move::test_move_base_onto_head ... ok
test command::test_move::test_move_force_in_memory ... ok
test command::test_hide::test_unhide ... ok
test command::test_move::test_move_with_unstaged_changes ... ok
test command::test_navigation::test_prev_multiple ... ok
test command::test_hide::test_hide_recursive ... ok
test command::test_move::test_move_branch ... ok
test command::test_navigation::test_next_multiple ... ok
test command::test_move::test_move_no_extra_checkout ... ok
test command::test_hide::test_hide_commit ... ok
test command::test_hide::test_branches_always_visible ... ok
test command::test_hide::test_hidden_commit_with_head_as_child ... ok
test command::test_move::test_move_checkout_new_head ... ok
test command::test_move::test_rebase_in_memory_updates_committer_timestamp ... ok
test command::test_hide::test_hide_master_commit_with_hidden_children ... ok
test command::test_smartlog::test_init_smartlog ... ok
test command::test_navigation::test_next_on_master ... ok
test command::test_navigation::test_next_on_master2 ... ok
test command::test_move::test_move_base_shared ... ok
test command::test_move::test_move_base ... ok
test command::test_move::test_move_main_branch_commits ... ok
test command::test_move::test_move_no_reapply_squashed_commits ... FAILED
test command::test_move::test_move_in_memory_gc ... ok
test command::test_restack::test_move_abandoned_branch ... ok
test command::test_smartlog::test_show_reachable_commit ... ok
test command::test_move::test_move_no_reapply_upstream_commits ... FAILED
test command::test_smartlog::test_active_non_head_main_branch_commit ... ok
test command::test_smartlog::test_custom_main_branch ... ok
test command::test_smartlog::test_smartlog_orphaned_root ... ok
test command::test_navigation::test_next_ambiguous ... ok
test command::test_undo::test_undo_help ... ok
test command::test_wrap::test_wrap_exit_code ... ok
test command::test_wrap::test_wrap_without_repo ... ok
test command::test_move::test_move_orphaned_root ... FAILED
test command::test_smartlog::test_sequential_master_commits ... ok
test command::test_wrap::test_wrap_explicit_git_executable ... ok
test command::test_undo::test_historical_smartlog_visibility ... ok
test command::test_smartlog::test_non_adjacent_commits ... ok
test command::test_undo::test_go_to_event ... ok
test command::test_smartlog::test_main_remote_branch ... ok
test command::test_restack::test_restack_aborts_during_rebase_conflict ... ok
test command::test_move::test_move_delete_checked_out_branch ... FAILED
test command::test_smartlog::test_merge_commit ... ok
test command::test_restack::test_amended_initial_commit ... ok
test command::test_smartlog::test_tree ... ok
test command::test_smartlog::test_show_hidden_commits ... ok
test command::test_move::test_move_merge_conflict ... ok
test command::test_undo::test_undo_doesnt_make_working_dir_dirty ... ok
test command::test_undo::test_undo_navigate ... ok
test core::test_hooks::test_pre_auto_gc ... ok
test command::test_undo::test_undo_move_refs ... ok
test command::test_undo::test_git_bisect_produces_empty_event ... ok
test command::test_smartlog::test_non_adjacent_commits2 ... ok
test command::test_move::test_move_with_source_not_in_smartlog ... ok
test command::test_smartlog::test_show_rewritten_commit_hash ... ok
test core::test_hooks::test_abandoned_branch_message ... ok
test command::test_smartlog::test_rebase ... ok
test command::test_move::test_move_stick ... ok
test command::test_smartlog::test_non_adjacent_commits3 ... ok
test command::test_undo::test_undo_hide ... ok
test command::test_smartlog::test_rebase_conflict ... ok
test command::test_wrap::test_wrap_rebase_in_transaction ... ok
test core::test_eventlog::test_git_v2_31_events ... ok
test core::test_hooks::test_interactive_rebase_noop ... ok
test command::test_restack::test_restack_amended_master ... ok
test core::test_hooks::test_merge_commit_recorded ... ok
test core::test_hooks::test_abandoned_commit_message ... ok
test core::test_gc::test_gc ... ok
test command::test_restack::test_restack_amended_commit ... ok
test core::test_hooks::test_rebase_individual_commit ... ok
test command::test_restack::test_restack_consecutive_rewrites ... ok
test command::test_move::test_move_branches_after_move ... ok
test command::test_move::test_move_tree ... ok
test command::test_restack::test_restack_single_of_many_commits ... ok
test command::test_restack::test_restack_multiple_amended ... ok
test core::test_hooks::test_fixup_no_abandoned_commit_message ... ok
test command::test_move::test_move_merge_commit ... ok

failures:

---- command::test_move::test_move_no_reapply_squashed_commits stdout ----
Error: Git command "/nix/store/32r66ar7hxcc4a6hh26yx49w79bjhnw7-git-2.33.0/bin/git" ["-C", "/build/.tmpkqVov8", "move", "--on-disk", "-b", "96d1c37a3d4363611c49f7e52186e189a04c531f", "-d", "master"] exited with unexpected code 1 (expected 0)
                stdout:
                branchless: running command: /nix/store/32r66ar7hxcc4a6hh26yx49w79bjhnw7-git-2.33.0/bin/git diff --quiet
Calling Git for on-disk rebase...
branchless: running command: /nix/store/32r66ar7hxcc4a6hh26yx49w79bjhnw7-git-2.33.0/bin/git rebase --continue
Skipped now-empty commit: e7bcdd60 create test1.txt

                stderr:
Executing: git branchless hook-register-extra-post-rewrite-hook
branchless: processing 1 update: ref HEAD
branchless: processing 1 update: ref HEAD
branchless: processed commit: e7bcdd60 create test1.txt
Executing: git branchless hook-detect-empty-commit 62fc20d2a290daea0d52bdc2ed2ad4be6491010e
The application panicked (crashed).
Message:  A fatal error occurred:
   0: Moving new rewritten-list into place
   1: failed to persist temporary file: Invalid cross-device link (os error 18)
   2: Invalid cross-device link (os error 18)

Location:
   src/core/rewrite/hooks.rs:63

  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ SPANTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

   0: branchless::core::rewrite::hooks::write_rewritten_list with rewritten_list_path="/build/.tmpkqVov8/.git/rebase-merge/rewritten-list" rewritten_oids=[(NonZeroOid(62fc20d2a290daea0d52bdc2ed2ad4be6491010e), 0000000000000000000000000000000000000000), (NonZeroOid(e7bcdd60abf632b107460dbf9d5a5e9fa06934b7), 0000000000000000000000000000000000000000)]
      at src/core/rewrite/hooks.rs:51
   1: branchless::core::rewrite::hooks::add_rewritten_list_entries with rewritten_list_path="/build/.tmpkqVov8/.git/rebase-merge/rewritten-list" entries=[(NonZeroOid(62fc20d2a290daea0d52bdc2ed2ad4be6491010e), 0000000000000000000000000000000000000000), (NonZeroOid(e7bcdd60abf632b107460dbf9d5a5e9fa06934b7), 0000000000000000000000000000000000000000)]
      at src/core/rewrite/hooks.rs:67

Backtrace omitted.
Run with RUST_BACKTRACE=1 environment variable to display it.
Run with RUST_BACKTRACE=full to include source snippets.
Location: src/commands.rs:262

Backtrace omitted.
Run with RUST_BACKTRACE=1 environment variable to display it.
Run with RUST_BACKTRACE=full to include source snippets.
warning: execution failed: git branchless hook-detect-empty-commit 62fc20d2a290daea0d52bdc2ed2ad4be6491010e
You can fix the problem, and then run

  git rebase --continue




Location:
    src/testing.rs:256:13
thread 'command::test_move::test_move_no_reapply_squashed_commits' panicked at 'assertion failed: `(left == right)`
  left: `1`,
 right: `0`: the test returned a termination value with a non-zero status code (1) which indicates a failure', /build/rustc-1.55.0-src/library/test/src/lib.rs:194:5
stack backtrace:
   0: rust_begin_unwind
   1: core::panicking::panic_fmt
   2: core::panicking::assert_failed_inner
   3: core::panicking::assert_failed
   4: core::ops::function::FnOnce::call_once
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

---- command::test_move::test_move_no_reapply_upstream_commits stdout ----
Error: Git command "/nix/store/32r66ar7hxcc4a6hh26yx49w79bjhnw7-git-2.33.0/bin/git" ["-C", "/build/.tmpGVlZ8h", "move", "--on-disk", "-b", "HEAD", "-d", "master"] exited with unexpected code 1 (expected 0)
                stdout:
                branchless: running command: /nix/store/32r66ar7hxcc4a6hh26yx49w79bjhnw7-git-2.33.0/bin/git diff --quiet
Calling Git for on-disk rebase...
branchless: running command: /nix/store/32r66ar7hxcc4a6hh26yx49w79bjhnw7-git-2.33.0/bin/git rebase --continue
Skipping commit (was already applied upstream): 62fc20d2 create test1.txt

                stderr:
Executing: git branchless hook-register-extra-post-rewrite-hook
branchless: processing 1 update: ref HEAD
Executing: git branchless hook-skip-upstream-applied-commit 62fc20d2a290daea0d52bdc2ed2ad4be6491010e
The application panicked (crashed).
Message:  A fatal error occurred:
   0: Moving new rewritten-list into place
   1: failed to persist temporary file: Invalid cross-device link (os error 18)
   2: Invalid cross-device link (os error 18)

Location:
   src/core/rewrite/hooks.rs:63

  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ SPANTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

   0: branchless::core::rewrite::hooks::write_rewritten_list with rewritten_list_path="/build/.tmpGVlZ8h/.git/rebase-merge/rewritten-list" rewritten_oids=[(NonZeroOid(62fc20d2a290daea0d52bdc2ed2ad4be6491010e), 0000000000000000000000000000000000000000)]
      at src/core/rewrite/hooks.rs:51
   1: branchless::core::rewrite::hooks::add_rewritten_list_entries with rewritten_list_path="/build/.tmpGVlZ8h/.git/rebase-merge/rewritten-list" entries=[(NonZeroOid(62fc20d2a290daea0d52bdc2ed2ad4be6491010e), 0000000000000000000000000000000000000000)]
      at src/core/rewrite/hooks.rs:67

Backtrace omitted.
Run with RUST_BACKTRACE=1 environment variable to display it.
Run with RUST_BACKTRACE=full to include source snippets.
Location: src/commands.rs:262

Backtrace omitted.
Run with RUST_BACKTRACE=1 environment variable to display it.
Run with RUST_BACKTRACE=full to include source snippets.
warning: execution failed: git branchless hook-skip-upstream-applied-commit 62fc20d2a290daea0d52bdc2ed2ad4be6491010e
You can fix the problem, and then run

  git rebase --continue




Location:
    src/testing.rs:256:13
thread 'command::test_move::test_move_no_reapply_upstream_commits' panicked at 'assertion failed: `(left == right)`
  left: `1`,
 right: `0`: the test returned a termination value with a non-zero status code (1) which indicates a failure', /build/rustc-1.55.0-src/library/test/src/lib.rs:194:5
stack backtrace:
   0: rust_begin_unwind
   1: core::panicking::panic_fmt
   2: core::panicking::assert_failed_inner
   3: core::panicking::assert_failed
   4: core::ops::function::FnOnce::call_once
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

---- command::test_move::test_move_orphaned_root stdout ----
Error: Git command "/nix/store/32r66ar7hxcc4a6hh26yx49w79bjhnw7-git-2.33.0/bin/git" ["-C", "/build/.tmpGwodxh", "move", "--on-disk", "-d", "master"] exited with unexpected code 1 (expected 0)
                stdout:
                branchless: running command: /nix/store/32r66ar7hxcc4a6hh26yx49w79bjhnw7-git-2.33.0/bin/git diff --quiet
Calling Git for on-disk rebase...
branchless: running command: /nix/store/32r66ar7hxcc4a6hh26yx49w79bjhnw7-git-2.33.0/bin/git rebase --continue
Skipped now-empty commit: 270b681e new root

                stderr:
Executing: git branchless hook-register-extra-post-rewrite-hook
branchless: processing 1 update: ref HEAD
branchless: processing 1 update: ref HEAD
branchless: processed commit: 270b681e new root
Executing: git branchless hook-detect-empty-commit da90168b4835f97f1a10bcc12833140056df9157
The application panicked (crashed).
Message:  A fatal error occurred:
   0: Moving new rewritten-list into place
   1: failed to persist temporary file: Invalid cross-device link (os error 18)
   2: Invalid cross-device link (os error 18)

Location:
   src/core/rewrite/hooks.rs:63

  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ SPANTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

   0: branchless::core::rewrite::hooks::write_rewritten_list with rewritten_list_path="/build/.tmpGwodxh/.git/rebase-merge/rewritten-list" rewritten_oids=[(NonZeroOid(da90168b4835f97f1a10bcc12833140056df9157), 0000000000000000000000000000000000000000), (NonZeroOid(270b681e50a90e23149a112d4220aff10f931c58), 0000000000000000000000000000000000000000)]
      at src/core/rewrite/hooks.rs:51
   1: branchless::core::rewrite::hooks::add_rewritten_list_entries with rewritten_list_path="/build/.tmpGwodxh/.git/rebase-merge/rewritten-list" entries=[(NonZeroOid(da90168b4835f97f1a10bcc12833140056df9157), 0000000000000000000000000000000000000000), (NonZeroOid(270b681e50a90e23149a112d4220aff10f931c58), 0000000000000000000000000000000000000000)]
      at src/core/rewrite/hooks.rs:67

Backtrace omitted.
Run with RUST_BACKTRACE=1 environment variable to display it.
Run with RUST_BACKTRACE=full to include source snippets.
Location: src/commands.rs:262

Backtrace omitted.
Run with RUST_BACKTRACE=1 environment variable to display it.
Run with RUST_BACKTRACE=full to include source snippets.
warning: execution failed: git branchless hook-detect-empty-commit da90168b4835f97f1a10bcc12833140056df9157
You can fix the problem, and then run

  git rebase --continue




Location:
    src/testing.rs:256:13
thread 'command::test_move::test_move_orphaned_root' panicked at 'assertion failed: `(left == right)`
  left: `1`,
 right: `0`: the test returned a termination value with a non-zero status code (1) which indicates a failure', /build/rustc-1.55.0-src/library/test/src/lib.rs:194:5
stack backtrace:
   0: rust_begin_unwind
   1: core::panicking::panic_fmt
   2: core::panicking::assert_failed_inner
   3: core::panicking::assert_failed
   4: core::ops::function::FnOnce::call_once
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

---- command::test_move::test_move_delete_checked_out_branch stdout ----
Error: Git command "/nix/store/32r66ar7hxcc4a6hh26yx49w79bjhnw7-git-2.33.0/bin/git" ["-C", "/build/.tmpYEGTKV", "move", "--on-disk", "-b", "HEAD", "-d", "master"] exited with unexpected code 1 (expected 0)
                stdout:
                branchless: running command: /nix/store/32r66ar7hxcc4a6hh26yx49w79bjhnw7-git-2.33.0/bin/git diff --quiet
Calling Git for on-disk rebase...
branchless: running command: /nix/store/32r66ar7hxcc4a6hh26yx49w79bjhnw7-git-2.33.0/bin/git rebase --continue
Skipping commit (was already applied upstream): 62fc20d2 create test1.txt

                stderr:
Executing: git branchless hook-register-extra-post-rewrite-hook
branchless: processing 1 update: ref HEAD
Executing: git branchless hook-skip-upstream-applied-commit 62fc20d2a290daea0d52bdc2ed2ad4be6491010e
The application panicked (crashed).
Message:  A fatal error occurred:
   0: Moving new rewritten-list into place
   1: failed to persist temporary file: Invalid cross-device link (os error 18)
   2: Invalid cross-device link (os error 18)

Location:
   src/core/rewrite/hooks.rs:63

  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ SPANTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

   0: branchless::core::rewrite::hooks::write_rewritten_list with rewritten_list_path="/build/.tmpYEGTKV/.git/rebase-merge/rewritten-list" rewritten_oids=[(NonZeroOid(62fc20d2a290daea0d52bdc2ed2ad4be6491010e), 0000000000000000000000000000000000000000)]
      at src/core/rewrite/hooks.rs:51
   1: branchless::core::rewrite::hooks::add_rewritten_list_entries with rewritten_list_path="/build/.tmpYEGTKV/.git/rebase-merge/rewritten-list" entries=[(NonZeroOid(62fc20d2a290daea0d52bdc2ed2ad4be6491010e), 0000000000000000000000000000000000000000)]
      at src/core/rewrite/hooks.rs:67

Backtrace omitted.
Run with RUST_BACKTRACE=1 environment variable to display it.
Run with RUST_BACKTRACE=full to include source snippets.
Location: src/commands.rs:262

Backtrace omitted.
Run with RUST_BACKTRACE=1 environment variable to display it.
Run with RUST_BACKTRACE=full to include source snippets.
warning: execution failed: git branchless hook-skip-upstream-applied-commit 62fc20d2a290daea0d52bdc2ed2ad4be6491010e
You can fix the problem, and then run

  git rebase --continue




Location:
    src/testing.rs:256:13
thread 'command::test_move::test_move_delete_checked_out_branch' panicked at 'assertion failed: `(left == right)`
  left: `1`,
 right: `0`: the test returned a termination value with a non-zero status code (1) which indicates a failure', /build/rustc-1.55.0-src/library/test/src/lib.rs:194:5
stack backtrace:
   0: rust_begin_unwind
   1: core::panicking::panic_fmt
   2: core::panicking::assert_failed_inner
   3: core::panicking::assert_failed
   4: core::ops::function::FnOnce::call_once
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.


failures:
    command::test_move::test_move_delete_checked_out_branch
    command::test_move::test_move_no_reapply_squashed_commits
    command::test_move::test_move_no_reapply_upstream_commits
    command::test_move::test_move_orphaned_root

test result: FAILED. 84 passed; 4 failed; 0 ignored; 0 measured; 0 filtered out; finished in 2.08s

error: test failed, to rerun pass '--test mod'
builder for '/nix/store/2zpcwnljxylpikadwl97i4xi15dg3151-git-branchless-0.3.6.drv' failed with exit code 101
error: build of '/nix/store/2zpcwnljxylpikadwl97i4xi15dg3151-git-branchless-0.3.6.drv' failed

---

Notes and edits:

• This seems to be very related to the Invalid cross-device link: Invalid cross-device link (os error 18) when upgrading on a docker OverlayFS  rust-lang/rustup#1239

[arxanas]

Hi @hmenke, thanks for your work in packaging git-branchless into Nix! Actually, if it's possible, we could add Nix as a target platform to check in CI, so that we can surface these errors earlier.

I'll have more time to look later this week.

From the error message, the cross-device errors seem to be happening when moving a file called rewritten-list to .git/rebase-merge/ as part of the rebase process. The intention was to populate it atomically. It's created with a tempfile library, so most likely what's happening is that /tmp (or whatever directory) is on another file system, so it can't actually be moved.

The fix would be to generate the temp file on the same file system. Perhaps the tempfile library has an option for that. If not, we could write to a file under .git/branchless/. Or, we could just give up the move approach altogether and write directly to the file, as concurrent accesses shouldn't be happening anyways.

[hmenke]

Okay, so this is what I have right now: hmenke/nixpkgs@e0c6f66
For now I just disabled the failing tests.

[arxanas]

I've opened #121 for the first issue and filed #122 to track the second issue.

[arxanas]

Both blocking issues have been fixed in the main branch. If it would help the Nix deployment, I can add a new tag/release, or else you can just use the commit 3149f83 directly.

[hmenke]

An new tag would look nicer but is not strictly necessary. Please proceed as you see fit.

[arxanas]

I tagged v0.3.6-nixos.0.