Function merge_subcommand_fork_point_options

tests/merge.rs:4338–4535

()

/// Test the --no-fork-point vs. --fork-point options
#[test]
fn merge_subcommand_fork_point_options() {
    println!("=== TEST SETUP: MERGE SUBCOMMAND FORK POINT OPTIONS ===");
    let repo_name = "merge_fork_point_options";
    let repo = setup_git_repo(repo_name);
    let path_to_repo = generate_path_to_repo(repo_name);

    // Helper function to get git log for a specific branch
    fn get_git_log(path_to_repo: &Path, branch_name: &str, num_entries: &str) -> String {
        let output = run_git_command(
            path_to_repo,
            vec!["log", "--oneline", "-n", num_entries, branch_name],
        );
        String::from_utf8_lossy(&output.stdout).to_string()
    }

    println!("=== REPOSITORY INITIALIZATION ===");
    // Create initial repository
    {
        create_new_file(&path_to_repo, "hello_world.txt", "Hello, world!");
        first_commit_all(&repo, "first commit");

        // Create branches for chain
        create_branch(&repo, "feature_1");
        checkout_branch(&repo, "feature_1");
        create_new_file(&path_to_repo, "feature1.txt", "Feature 1 content");
        commit_all(&repo, "feature 1 commit");

        create_branch(&repo, "feature_2");
        checkout_branch(&repo, "feature_2");
        create_new_file(&path_to_repo, "feature2.txt", "Feature 2 content");
        commit_all(&repo, "feature 2 commit");

        println!("=== SETTING UP CHAIN ===");
        // Setup the chain
        let args: Vec<&str> = vec!["setup", "feature_chain", "master", "feature_1", "feature_2"];
        let output = run_test_bin_expect_ok(&path_to_repo, args);

        let stdout = String::from_utf8_lossy(&output.stdout);
        let success_setup = stdout.contains("Succesfully set up chain: feature_chain");

        println!("Chain setup output: {}", stdout);
        println!("Chain setup success: {}", success_setup);

        assert!(
            success_setup,
            "stdout should confirm chain setup but got: {}",
            stdout
        );
    }

    println!("=== MASTER BRANCH FIRST UPDATE ===");
    // Update master
    checkout_branch(&repo, "master");
    create_new_file(&path_to_repo, "master_update.txt", "Master update");
    commit_all(&repo, "Update master");

    // Verify master has the update
    let master_log = get_git_log(&path_to_repo, "master", "5");