Function processFiles

commands/command_merge_driver.go:49–94

(fileSpecifiers map[string]string, program string, outputFile string)

}

func processFiles(fileSpecifiers map[string]string, program string, outputFile string) (int, error) {
	defer mergeCleanup(fileSpecifiers)

	var exitStatus int
	formattedMergeProgram := subprocess.FormatPercentSequences(mergeDriverProgram, fileSpecifiers)
	cmd, err := subprocess.ExecCommand("sh", "-c", formattedMergeProgram)
	if err != nil {
		return -1, errors.New(tr.Tr.Get("failed to run merge program %q: %s", formattedMergeProgram, err))
	}
	err = cmd.Run()
	// If it runs but exits nonzero, then that means there's conflicts
	if err != nil {
		if exitError, ok := err.(*exec.ExitError); ok {
			exitStatus = exitError.ProcessState.ExitCode()
		} else {
			return -1, errors.New(tr.Tr.Get("failed to run merge program %q: %s", formattedMergeProgram, err))
		}
	}

	outputFp, err := os.OpenFile(outputFile, os.O_WRONLY|os.O_CREATE, 0600)
	if err != nil {
		return -1, err
	}
	defer outputFp.Close()

	filename := fileSpecifiers["D"]

	stat, err := os.Stat(filename)
	if err != nil {
		return -1, err
	}

	inputFp, err := os.OpenFile(filename, os.O_RDONLY|os.O_CREATE, 0600)
	if err != nil {
		return -1, err
	}
	defer inputFp.Close()

	gf := lfs.NewGitFilter(cfg)
	_, err = clean(gf, outputFp, inputFp, filename, stat.Size())
	if err != nil {
		return -1, err
	}

	return exitStatus, nil
}

func mergeCleanup(fileSpecifiers map[string]string) {
	ids := []string{"A", "O", "B", "D"}