Struct MergeDriverArgs 

pub struct MergeDriverArgs {
    pub ancestor: Option<String>,
    pub current: Option<String>,
    pub other: Option<String>,
    pub output: Option<String>,
    pub program: Option<String>,
    pub marker_size: u32,
}

Merge driver for LFS-tracked files

Invoked by Git through a merge.<name>.driver configuration entry, typically wired up as:

[merge "lfs"]
    name = LFS merge driver
    driver = git lfs merge-driver --ancestor %O --current %A --other %B --marker-size %L --output %A

For each of --ancestor, --current, and --other, the input file is either a pointer (smudged through to its working-tree content, fetching the object on demand if necessary) or already plain content (used as-is). The three resulting files plus a fresh tempfile for the merged output are substituted into --program (default git merge-file --stdout --marker-size=%L %A %O %B >%D) and run via sh -c. The merged content is then cleaned back into a pointer and written to --output. Non-zero exit from the merge program indicates conflicts; that exit code is propagated.

Fields

ancestor: Option<String>

File containing the ancestor (merge-base) version. Pointer or raw content; substituted for %O in the program template.

current: Option<String>

File containing the current (ours) version. Pointer or raw content; substituted for %A in the program template.

other: Option<String>

File containing the other (theirs) version. Pointer or raw content; substituted for %B in the program template.

output: Option<String>

Path to write the merged pointer to. Typically the same path as --current so that Git picks up the result.

program: Option<String>

Merge program template. Defaults to git merge-file --stdout --marker-size=%L %A %O %B >%D. %A, %O, %B, %D, and %L are substituted with shell-quoted paths / the marker size; %% emits a literal %.

marker_size: u32

Conflict marker size to substitute for %L.

Trait Implementations

impl Args for MergeDriverArgs

fn group_id() -> Option<Id>

Report the ArgGroup::id for this set of arguments

fn augment_args<'b>(__clap_app: Command) -> Command

Append to Command so it can instantiate Self via FromArgMatches::from_arg_matches_mut

fn augment_args_for_update<'b>(__clap_app: Command) -> Command

Append to Command so it can instantiate self via FromArgMatches::update_from_arg_matches_mut

impl FromArgMatches for MergeDriverArgs

fn from_arg_matches(__clap_arg_matches: &ArgMatches) -> Result<Self, Error>

Instantiate Self from ArgMatches, parsing the arguments as needed.

fn from_arg_matches_mut( __clap_arg_matches: &mut ArgMatches, ) -> Result<Self, Error>

Instantiate Self from ArgMatches, parsing the arguments as needed.

fn update_from_arg_matches( &mut self, __clap_arg_matches: &ArgMatches, ) -> Result<(), Error>

Assign values from ArgMatches to self.

fn update_from_arg_matches_mut( &mut self, __clap_arg_matches: &mut ArgMatches, ) -> Result<(), Error>

Assign values from ArgMatches to self.