feat(merge): add more bindings and api methods

lib/src/bindings/index.dart

@@ -60,6 +60,28 @@ Pointer<git_oid> writeTree(Pointer<git_index> index) {
   }
 }
 
+/// Write the index as a tree to the given repository.
+///
+/// This method will do the same as [writeTree], but letting the user choose the repository
+/// where the tree will be written.
+///
+/// The index must not contain any file in conflict.
+///
+/// Throws a [LibGit2Error] if error occured.
+Pointer<git_oid> writeTreeTo(
+  Pointer<git_index> index,
+  Pointer<git_repository> repo,
+) {
+  final out = calloc<git_oid>();
+  final error = libgit2.git_index_write_tree_to(out, index, repo);
+
+  if (error < 0) {
+    throw LibGit2Error(libgit2.git_error_last());
+  } else {
+    return out;
+  }
+}
+
 /// Find the first position of any entries which point to given path in the Git index.
 bool find(Pointer<git_index> index, String path) {
   final pathC = path.toNativeUtf8().cast<Int8>();
@@ -262,6 +284,69 @@ void removeAll(Pointer<git_index> index, List<String> pathspec) {
   }
 }
 
+/// Determine if the index contains entries representing file conflicts.
+bool hasConflicts(Pointer<git_index> index) {
+  return libgit2.git_index_has_conflicts(index) == 1 ? true : false;
+}
+
+/// Return list of conflicts in the index.
+///
+/// Throws a [LibGit2Error] if error occured.
+List<Map<String, Pointer<git_index_entry>>> conflictList(
+    Pointer<git_index> index) {
+  final iterator = calloc<Pointer<git_index_conflict_iterator>>();
+  final iteratorError =
+      libgit2.git_index_conflict_iterator_new(iterator, index);
+
+  if (iteratorError < 0) {
+    throw LibGit2Error(libgit2.git_error_last());
+  }
+
+  var result = <Map<String, Pointer<git_index_entry>>>[];
+  var error = 0;
+
+  while (error >= 0) {
+    final ancestorOut = calloc<Pointer<git_index_entry>>();
+    final ourOut = calloc<Pointer<git_index_entry>>();
+    final theirOut = calloc<Pointer<git_index_entry>>();
+    error = libgit2.git_index_conflict_next(
+      ancestorOut,
+      ourOut,
+      theirOut,
+      iterator.value,
+    );
+    if (error >= 0) {
+      result.add({
+        'ancestor': ancestorOut.value,
+        'our': ourOut.value,
+        'their': theirOut.value,
+      });
+      calloc.free(ancestorOut);
+      calloc.free(ourOut);
+      calloc.free(theirOut);
+    } else {
+      break;
+    }
+  }
+
+  libgit2.git_index_conflict_iterator_free(iterator.value);
+  return result;
+}
+
+/// Removes the index entries that represent a conflict of a single file.
+///
+/// Throws a [LibGit2Error] if error occured.
+void conflictRemove(Pointer<git_index> index, String path) {
+  final pathC = path.toNativeUtf8().cast<Int8>();
+  final error = libgit2.git_index_conflict_remove(index, pathC);
+
+  calloc.free(pathC);
+
+  if (error < 0) {
+    throw LibGit2Error(libgit2.git_error_last());
+  }
+}
+
 /// Get the repository this index relates to.
 Pointer<git_repository> owner(Pointer<git_index> index) =>
     libgit2.git_index_owner(index);

lib/src/bindings/merge.dart

@@ -54,3 +54,115 @@ List<int> analysis(
     return result;
   }
 }
+
+/// Merges the given commit(s) into HEAD, writing the results into the working directory.
+/// Any changes are staged for commit and any conflicts are written to the index. Callers
+/// should inspect the repository's index after this completes, resolve any conflicts and
+/// prepare a commit.
+///
+/// Throws a [LibGit2Error] if error occured.
+void merge(
+  Pointer<git_repository> repo,
+  Pointer<Pointer<git_annotated_commit>> theirHeads,
+  int theirHeadsLen,
+) {
+  final mergeOpts = calloc<git_merge_options>(sizeOf<git_merge_options>());
+  libgit2.git_merge_options_init(mergeOpts, 1);
+
+  final checkoutOpts =
+      calloc<git_checkout_options>(sizeOf<git_checkout_options>());
+  libgit2.git_checkout_options_init(checkoutOpts, 1);
+  checkoutOpts.ref.checkout_strategy =
+      git_checkout_strategy_t.GIT_CHECKOUT_SAFE +
+          git_checkout_strategy_t.GIT_CHECKOUT_RECREATE_MISSING;
+
+  final error = libgit2.git_merge(
+    repo,
+    theirHeads,
+    theirHeadsLen,
+    mergeOpts,
+    checkoutOpts,
+  );
+
+  if (error < 0) {
+    throw LibGit2Error(libgit2.git_error_last());
+  }
+}
+
+/// Merge two commits, producing a git_index that reflects the result of the merge.
+/// The index may be written as-is to the working directory or checked out. If the index
+/// is to be converted to a tree, the caller should resolve any conflicts that arose as
+/// part of the merge.
+///
+/// The returned index must be freed explicitly.
+///
+/// Throws a [LibGit2Error] if error occured.
+Pointer<git_index> mergeCommits(
+  Pointer<git_repository> repo,
+  Pointer<git_commit> ourCommit,
+  Pointer<git_commit> theirCommit,
+  Map<String, int> opts,
+) {
+  final out = calloc<Pointer<git_index>>();
+  final optsC = calloc<git_merge_options>(sizeOf<git_merge_options>());
+  optsC.ref.file_favor = opts['favor']!;
+  optsC.ref.flags = opts['mergeFlags']!;
+  optsC.ref.file_flags = opts['fileFlags']!;
+  optsC.ref.version = GIT_MERGE_OPTIONS_VERSION;
+
+  final error = libgit2.git_merge_commits(
+    out,
+    repo,
+    ourCommit,
+    theirCommit,
+    optsC,
+  );
+
+  calloc.free(optsC);
+
+  if (error < 0) {
+    throw LibGit2Error(libgit2.git_error_last());
+  } else {
+    return out.value;
+  }
+}
+
+/// Merge two trees, producing a git_index that reflects the result of the merge.
+/// The index may be written as-is to the working directory or checked out. If the index
+/// is to be converted to a tree, the caller should resolve any conflicts that arose as part
+/// of the merge.
+///
+/// The returned index must be freed explicitly.
+///
+/// Throws a [LibGit2Error] if error occured.
+Pointer<git_index> mergeTrees(
+  Pointer<git_repository> repo,
+  Pointer<git_tree> ancestorTree,
+  Pointer<git_tree> ourTree,
+  Pointer<git_tree> theirTree,
+  Map<String, int> opts,
+) {
+  final out = calloc<Pointer<git_index>>();
+  final optsC = calloc<git_merge_options>(sizeOf<git_merge_options>());
+  optsC.ref.file_favor = opts['favor']!;
+  optsC.ref.flags = opts['mergeFlags']!;
+  optsC.ref.file_flags = opts['fileFlags']!;
+  optsC.ref.version = GIT_MERGE_OPTIONS_VERSION;
+
+  final error = libgit2.git_merge_trees(
+    out,
+    repo,
+    ancestorTree,
+    ourTree,
+    theirTree,
+    optsC,
+  );
+
+  calloc.free(optsC);
+
+  if (error < 0) {
+    throw LibGit2Error(libgit2.git_error_last());
+  } else {
+    return out.value;
+  }
+}

lib/src/git_types.dart

@@ -195,3 +195,117 @@ class GitMergePreference {
 
   int get value => _value;
 }
+
+/// Repository state.
+///
+/// These values represent possible states for the repository to be in,
+/// based on the current operation which is ongoing.
+class GitRepositoryState {
+  const GitRepositoryState._(this._value);
+  final int _value;
+
+  static const none = GitRepositoryState._(0);
+  static const merge = GitRepositoryState._(1);
+  static const revert = GitRepositoryState._(2);
+  static const reverSequence = GitRepositoryState._(3);
+  static const cherrypick = GitRepositoryState._(4);
+  static const cherrypickSequence = GitRepositoryState._(5);
+  static const bisect = GitRepositoryState._(6);
+  static const rebase = GitRepositoryState._(7);
+  static const rebaseInteractive = GitRepositoryState._(8);
+  static const rebaseMerge = GitRepositoryState._(9);
+  static const applyMailbox = GitRepositoryState._(10);
+  static const applyMailboxOrRebase = GitRepositoryState._(11);
+
+  int get value => _value;
+}
+
+/// Flags for merge options.
+class GitMergeFlag {
+  const GitMergeFlag._(this._value);
+  final int _value;
+
+  /// Detect renames that occur between the common ancestor and the "ours"
+  /// side or the common ancestor and the "theirs" side.  This will enable
+  /// the ability to merge between a modified and renamed file.
+  static const findRenames = GitMergeFlag._(1);
+
+  /// If a conflict occurs, exit immediately instead of attempting to
+  /// continue resolving conflicts.  The merge operation will fail with
+  /// and no index will be returned.
+  static const failOnConflict = GitMergeFlag._(2);
+
+  /// Do not write the REUC extension on the generated index.
+  static const skipREUC = GitMergeFlag._(4);
+
+  /// If the commits being merged have multiple merge bases, do not build
+  /// a recursive merge base (by merging the multiple merge bases),
+  /// instead simply use the first base.
+  static const noRecursive = GitMergeFlag._(8);
+
+  int get value => _value;
+}
+
+/// Merge file favor options to instruct the file-level merging functionality
+/// on how to deal with conflicting regions of the files.
+class GitMergeFileFavor {
+  const GitMergeFileFavor._(this._value);
+  final int _value;
+
+  /// When a region of a file is changed in both branches, a conflict
+  /// will be recorded in the index. This is the default.
+  static const normal = GitMergeFileFavor._(0);
+
+  /// When a region of a file is changed in both branches, the file
+  /// created in the index will contain the "ours" side of any conflicting
+  /// region. The index will not record a conflict.
+  static const ours = GitMergeFileFavor._(1);
+
+  /// When a region of a file is changed in both branches, the file
+  /// created in the index will contain the "theirs" side of any conflicting
+  /// region. The index will not record a conflict.
+  static const theirs = GitMergeFileFavor._(2);
+
+  /// When a region of a file is changed in both branches, the file
+  /// created in the index will contain each unique line from each side,
+  /// which has the result of combining both files. The index will not
+  /// record a conflict.
+  static const union = GitMergeFileFavor._(3);
+
+  int get value => _value;
+}
+
+/// File merging flags.
+class GitMergeFileFlag {
+  const GitMergeFileFlag._(this._value);
+  final int _value;
+
+  /// Defaults.
+  static const defaults = GitMergeFileFlag._(0);
+
+  /// Create standard conflicted merge files.
+  static const styleMerge = GitMergeFileFlag._(1);
+
+  /// Create diff3-style files.
+  static const styleDiff3 = GitMergeFileFlag._(2);
+
+  /// Condense non-alphanumeric regions for simplified diff file.
+  static const simplifyAlnum = GitMergeFileFlag._(4);
+
+  /// Ignore all whitespace.
+  static const ignoreWhitespace = GitMergeFileFlag._(8);
+
+  /// Ignore changes in amount of whitespace.
+  static const ignoreWhitespaceChange = GitMergeFileFlag._(16);
+
+  /// Ignore whitespace at end of line.
+  static const ignoreWhitespaceEOL = GitMergeFileFlag._(32);
+
+  /// Use the "patience diff" algorithm.
+  static const diffPatience = GitMergeFileFlag._(64);
+
+  /// Take extra time to find minimal diff.
+  static const diffMinimal = GitMergeFileFlag._(128);
+
+  int get value => _value;
+}

lib/src/index.dart

@@ -37,6 +37,43 @@ class Index {
   /// Returns the count of entries currently in the index.
   int get count => bindings.entryCount(_indexPointer);
 
+  /// Checks if the index contains entries representing file conflicts.
+  bool get hasConflicts => bindings.hasConflicts(_indexPointer);
+
+  /// Returns map of conflicts in the index with key as conflicted file path and
+  /// value as [ConflictEntry] object.
+  ///
+  /// Throws a [LibGit2Error] if error occured.
+  Map<String, ConflictEntry> get conflicts {
+    final conflicts = bindings.conflictList(_indexPointer);
+    var result = <String, ConflictEntry>{};
+
+    for (var entry in conflicts) {
+      IndexEntry? ancestor, our, their;
+      String path;
+
+      entry['ancestor'] == nullptr
+          ? ancestor = null
+          : ancestor = IndexEntry(entry['ancestor']!);
+      entry['our'] == nullptr ? our = null : our = IndexEntry(entry['our']!);
+      entry['their'] == nullptr
+          ? their = null
+          : their = IndexEntry(entry['their']!);
+
+      if (ancestor != null) {
+        path = ancestor.path;
+      } else if (our != null) {
+        path = our.path;
+      } else {
+        path = their!.path;
+      }
+
+      result[path] = ConflictEntry(_indexPointer, path, ancestor, our, their);
+    }
+
+    return result;
+  }
+
   /// Clears the contents (all the entries) of an index object.
   ///
   /// This clears the index object in memory; changes must be explicitly written to
@@ -124,7 +161,15 @@ class Index {
   /// returns the OID of the root tree. This is the OID that can be used e.g. to create a commit.
   ///
   /// The index must not contain any file in conflict.
-  Oid writeTree() => Oid(bindings.writeTree(_indexPointer));
+  ///
+  /// Throws a [LibGit2Error] if error occured or there is no associated repository and no [repo] passed.
+  Oid writeTree([Repository? repo]) {
+    if (repo == null) {
+      return Oid(bindings.writeTree(_indexPointer));
+    } else {
+      return Oid(bindings.writeTreeTo(_indexPointer, repo.pointer));
+    }
+  }
 
   /// Removes an entry from the index.
   ///
@@ -176,3 +221,34 @@ class IndexEntry {
     return hex.toString();
   }
 }
+
+class ConflictEntry {
+  /// Initializes a new instance of [ConflictEntry] class.
+  const ConflictEntry(
+    this._indexPointer,
+    this._path,
+    this.ancestor,
+    this.our,
+    this.their,
+  );
+
+  /// Common ancestor.
+  final IndexEntry? ancestor;
+
+  /// "Our" side of the conflict.
+  final IndexEntry? our;
+
+  /// "Their" side of the conflict.
+  final IndexEntry? their;
+
+  /// Pointer to memory address for allocated index object.
+  final Pointer<git_index> _indexPointer;
+
+  /// Path to conflicted file.
+  final String _path;
+
+  /// Removes the index entry that represent a conflict of a single file.
+  ///
+  /// Throws a [LibGit2Error] if error occured.
+  void remove() => bindings.conflictRemove(_indexPointer, _path);
+}

lib/src/repository.dart

@@ -1,5 +1,6 @@
 import 'dart:ffi';
 import 'package:ffi/ffi.dart';
+import 'package:libgit2dart/libgit2dart.dart';
 import 'bindings/libgit2_bindings.dart';
 import 'bindings/repository.dart' as bindings;
 import 'bindings/merge.dart' as merge_bindings;
@@ -192,7 +193,6 @@ class Repository {
 
   /// Returns the status of a git repository - ie, whether an operation
   /// (merge, cherry-pick, etc) is in progress.
-  // git_repository_state_t from libgit2_bindings.dart represents possible states
   int get state => bindings.state(_repoPointer);
 
   /// Removes all the metadata associated with an ongoing command like
@@ -517,4 +517,95 @@ class Repository {
 
     return result;
   }
+
+  /// Merges the given commit(s) oid into HEAD, writing the results into the working directory.
+  /// Any changes are staged for commit and any conflicts are written to the index. Callers
+  /// should inspect the repository's index after this completes, resolve any conflicts and
+  /// prepare a commit.
+  ///
+  /// Throws a [LibGit2Error] if error occured.
+  void merge(Oid oid) {
+    final theirHead = commit_bindings.annotatedLookup(
+      _repoPointer,
+      oid.pointer,
+    );
+
+    merge_bindings.merge(_repoPointer, theirHead, 1);
+
+    commit_bindings.annotatedFree(theirHead.value);
+  }
+
+  /// Merges two commits, producing a git_index that reflects the result of the merge.
+  /// The index may be written as-is to the working directory or checked out. If the index
+  /// is to be converted to a tree, the caller should resolve any conflicts that arose as
+  /// part of the merge.
+  ///
+  /// The returned index must be freed explicitly.
+  ///
+  /// Throws a [LibGit2Error] if error occured.
+  Index mergeCommits({
+    required Commit ourCommit,
+    required Commit theirCommit,
+    GitMergeFileFavor favor = GitMergeFileFavor.normal,
+    List<GitMergeFlag> mergeFlags = const [GitMergeFlag.findRenames],
+    List<GitMergeFileFlag> fileFlags = const [GitMergeFileFlag.defaults],
+  }) {
+    var opts = <String, int>{};
+    opts['favor'] = favor.value;
+    opts['mergeFlags'] = mergeFlags.fold(
+      0,
+      (previousValue, element) => previousValue + element.value,
+    );
+    opts['fileFlags'] = fileFlags.fold(
+      0,
+      (previousValue, element) => previousValue + element.value,
+    );
+
+    final result = merge_bindings.mergeCommits(
+      _repoPointer,
+      ourCommit.pointer,
+      theirCommit.pointer,
+      opts,
+    );
+
+    return Index(result);
+  }
+
+  /// Merge two trees, producing a git_index that reflects the result of the merge.
+  /// The index may be written as-is to the working directory or checked out. If the index
+  /// is to be converted to a tree, the caller should resolve any conflicts that arose as part
+  /// of the merge.
+  ///
+  /// The returned index must be freed explicitly.
+  ///
+  /// Throws a [LibGit2Error] if error occured.
+  Index mergeTrees({
+    required Tree ancestorTree,
+    required Tree ourTree,
+    required Tree theirTree,
+    GitMergeFileFavor favor = GitMergeFileFavor.normal,
+    List<GitMergeFlag> mergeFlags = const [GitMergeFlag.findRenames],
+    List<GitMergeFileFlag> fileFlags = const [GitMergeFileFlag.defaults],
+  }) {
+    var opts = <String, int>{};
+    opts['favor'] = favor.value;
+    opts['mergeFlags'] = mergeFlags.fold(
+      0,
+      (previousValue, element) => previousValue + element.value,
+    );
+    opts['fileFlags'] = fileFlags.fold(
+      0,
+      (previousValue, element) => previousValue + element.value,
+    );
+
+    final result = merge_bindings.mergeTrees(
+      _repoPointer,
+      ancestorTree.pointer,
+      ourTree.pointer,
+      theirTree.pointer,
+      opts,
+    );
+
+    return Index(result);
+  }
 }

test/assets/mergerepo/.gitdir/COMMIT_EDITMSG

@@ -0,0 +1 @@
+master conflict commit

test/assets/mergerepo/.gitdir/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

test/assets/mergerepo/.gitdir/ORIG_HEAD

@@ -0,0 +1 @@
+c68ff54aabf660fcdd9a2838d401583fe31249e3

test/assets/mergerepo/.gitdir/config

@@ -0,0 +1,9 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+  editor = vim
+[remote "origin"]
+	url = git://github.com/SkinnyMind/libgit2dart.git
+	fetch = +refs/heads/*:refs/remotes/origin/*

test/assets/mergerepo/.gitdir/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/assets/mergerepo/.gitdir/hooks/applypatch-msg.sample

@@ -0,0 +1,15 @@
+#!/usr/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
+:

test/assets/mergerepo/.gitdir/hooks/commit-msg.sample

@@ -0,0 +1,24 @@
+#!/usr/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

test/assets/mergerepo/.gitdir/hooks/fsmonitor-watchman.sample

@@ -0,0 +1,173 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+	die "Unsupported query-fsmonitor hook version '$version'.\n" .
+	    "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
+
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
+
+	# In the query expression below we're asking for names of files that
+	# changed since $last_update_token but not from the .git folder.
+	#
+	# To accomplish this, we're using the "since" generator to use the
+	# recency index to select candidate nodes and "fields" to limit the
+	# output to file names only. Then we're using the "expression" term to
+	# further constrain the results.
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+	}
+	my $query = <<"	END";
+		["query", "$git_work_tree", {
+			"since": $last_update_token,
+			"fields": ["name"],
+			"expression": ["not", ["dirname", ".git"]]
+		}]
+	END
+
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
+	print CHLD_IN $query;
+	close CHLD_IN;
+	my $response = do {local $/; <CHLD_OUT>};
+
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
+	die "Watchman: command returned no output.\n" .
+	"Falling back to scanning...\n" if $response eq "";
+	die "Watchman: command returned invalid output: $response\n" .
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
+		$retry--;
+		my $response = qx/watchman watch "$git_work_tree"/;
+		die "Failed to make watchman watch '$git_work_tree'.\n" .
+		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
+
+		# Watchman will always return all files on the first query so
+		# return the fast "everything is dirty" flag to git and do the
+		# Watchman query just to get it over with now so we won't pay
+		# the cost in git to look up each individual file.
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
+		eval { launch_watchman() };
+		return 0;
+	}
+
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;
+
+	return 1;
+}
+
+sub get_working_dir {
+	my $working_dir;
+	if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+		$working_dir = Win32::GetCwd();
+		$working_dir =~ tr/\\/\//;
+	} else {
+		require Cwd;
+		$working_dir = Cwd::cwd();
+	}
+
+	return $working_dir;
+}

test/assets/mergerepo/.gitdir/hooks/post-update.sample

@@ -0,0 +1,8 @@
+#!/usr/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

test/assets/mergerepo/.gitdir/hooks/pre-applypatch.sample

@@ -0,0 +1,14 @@
+#!/usr/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
+:

test/assets/mergerepo/.gitdir/hooks/pre-commit.sample

@@ -0,0 +1,49 @@
+#!/usr/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=$(git hash-object -t tree /dev/null)
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --type=bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

test/assets/mergerepo/.gitdir/hooks/pre-merge-commit.sample

@@ -0,0 +1,13 @@
+#!/usr/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+        exec "$GIT_DIR/hooks/pre-commit"
+:

test/assets/mergerepo/.gitdir/hooks/pre-push.sample

@@ -0,0 +1,53 @@
+#!/usr/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+	if test "$local_oid" = "$zero"
+	then
+		# Handle delete
+		:
+	else
+		if test "$remote_oid" = "$zero"
+		then
+			# New branch, examine all commits
+			range="$local_oid"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_oid..$local_oid"
+		fi
+
+		# Check for WIP commit
+		commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+		if test -n "$commit"
+		then
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

test/assets/mergerepo/.gitdir/hooks/pre-rebase.sample

@@ -0,0 +1,169 @@
+#!/usr/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up to date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".
+
+DOC_END

test/assets/mergerepo/.gitdir/hooks/pre-receive.sample

@@ -0,0 +1,24 @@
+#!/usr/bin/sh
+#
+# An example hook script to make use of push options.
+# The example simply echoes all push options that start with 'echoback='
+# and rejects all pushes when the "reject" push option is used.
+#
+# To enable this hook, rename this file to "pre-receive".
+
+if test -n "$GIT_PUSH_OPTION_COUNT"
+then
+	i=0
+	while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
+	do
+		eval "value=\$GIT_PUSH_OPTION_$i"
+		case "$value" in
+		echoback=*)
+			echo "echo from the pre-receive-hook: ${value#*=}" >&2
+			;;
+		reject)
+			exit 1
+		esac
+		i=$((i + 1))
+	done
+fi

test/assets/mergerepo/.gitdir/hooks/prepare-commit-msg.sample

@@ -0,0 +1,42 @@
+#!/usr/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
+
+# case "$COMMIT_SOURCE,$SHA1" in
+#  ,|template,)
+#    /usr/bin/perl -i.bak -pe '
+#       print "\n" . `git diff --cached --name-status -r`
+# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+#  *) ;;
+# esac
+
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi

test/assets/mergerepo/.gitdir/hooks/push-to-checkout.sample

@@ -0,0 +1,78 @@
+#!/usr/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+	echo >&2 "$*"
+	exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+	die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+	die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+#   head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+	head=HEAD
+else
+	head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+	die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+	die "Could not update working tree to new HEAD"
+fi

test/assets/mergerepo/.gitdir/hooks/update.sample

@@ -0,0 +1,128 @@
+#!/usr/bin/sh
+#
+# An example hook script to block unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

test/assets/mergerepo/.gitdir/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

test/assets/mergerepo/.gitdir/logs/HEAD

@@ -0,0 +1,15 @@
+0000000000000000000000000000000000000000 f17d0d48eae3aa08cecf29128a35e310c97b3521 Aleksey Kulikov <skinny.mind@gmail.com> 1626090830 +0300	commit (initial): init
+f17d0d48eae3aa08cecf29128a35e310c97b3521 f17d0d48eae3aa08cecf29128a35e310c97b3521 Aleksey Kulikov <skinny.mind@gmail.com> 1626090891 +0300	checkout: moving from master to feature
+f17d0d48eae3aa08cecf29128a35e310c97b3521 6cbc22e509d72758ab4c8d9f287ea846b90c448b Aleksey Kulikov <skinny.mind@gmail.com> 1626091020 +0300	commit: add feature file
+6cbc22e509d72758ab4c8d9f287ea846b90c448b fc38877b2552ab554752d9a77e1f48f738cca79b Aleksey Kulikov <skinny.mind@gmail.com> 1626091054 +0300	commit: edit feature file
+fc38877b2552ab554752d9a77e1f48f738cca79b f17d0d48eae3aa08cecf29128a35e310c97b3521 Aleksey Kulikov <skinny.mind@gmail.com> 1626091067 +0300	checkout: moving from feature to master
+f17d0d48eae3aa08cecf29128a35e310c97b3521 c68ff54aabf660fcdd9a2838d401583fe31249e3 Aleksey Kulikov <skinny.mind@gmail.com> 1626091171 +0300	commit: add .gitignore
+c68ff54aabf660fcdd9a2838d401583fe31249e3 78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 Aleksey Kulikov <skinny.mind@gmail.com> 1626091184 +0300	merge feature: Merge made by the 'recursive' strategy.
+78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 fc38877b2552ab554752d9a77e1f48f738cca79b Aleksey Kulikov <skinny.mind@gmail.com> 1626091245 +0300	checkout: moving from master to feature
+fc38877b2552ab554752d9a77e1f48f738cca79b 5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 Aleksey Kulikov <skinny.mind@gmail.com> 1626091274 +0300	commit: add another feature file
+5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 Aleksey Kulikov <skinny.mind@gmail.com> 1626091285 +0300	checkout: moving from feature to master
+78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 821ed6e80627b8769d170a293862f9fc60825226 Aleksey Kulikov <skinny.mind@gmail.com> 1630568461 +0300	commit: add subdirectory file
+821ed6e80627b8769d170a293862f9fc60825226 821ed6e80627b8769d170a293862f9fc60825226 Aleksey Kulikov <skinny.mind@gmail.com> 1631172121 +0300	checkout: moving from master to conflict-branch
+821ed6e80627b8769d170a293862f9fc60825226 47af50e6a799d7d0dde6630d2644f9484fb670f7 Aleksey Kulikov <skinny.mind@gmail.com> 1631172155 +0300	commit: conflict branch commit
+47af50e6a799d7d0dde6630d2644f9484fb670f7 821ed6e80627b8769d170a293862f9fc60825226 Aleksey Kulikov <skinny.mind@gmail.com> 1631172159 +0300	checkout: moving from conflict-branch to master
+821ed6e80627b8769d170a293862f9fc60825226 14905459d775f3f56a39ebc2ff081163f7da3529 Aleksey Kulikov <skinny.mind@gmail.com> 1631172175 +0300	commit: master conflict commit

test/assets/mergerepo/.gitdir/logs/refs/heads/conflict-branch

@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 821ed6e80627b8769d170a293862f9fc60825226 Aleksey Kulikov <skinny.mind@gmail.com> 1631172121 +0300	branch: Created from HEAD
+821ed6e80627b8769d170a293862f9fc60825226 47af50e6a799d7d0dde6630d2644f9484fb670f7 Aleksey Kulikov <skinny.mind@gmail.com> 1631172155 +0300	commit: conflict branch commit

test/assets/mergerepo/.gitdir/logs/refs/heads/feature

@@ -0,0 +1,4 @@
+0000000000000000000000000000000000000000 f17d0d48eae3aa08cecf29128a35e310c97b3521 Aleksey Kulikov <skinny.mind@gmail.com> 1626090891 +0300	branch: Created from HEAD
+f17d0d48eae3aa08cecf29128a35e310c97b3521 6cbc22e509d72758ab4c8d9f287ea846b90c448b Aleksey Kulikov <skinny.mind@gmail.com> 1626091020 +0300	commit: add feature file
+6cbc22e509d72758ab4c8d9f287ea846b90c448b fc38877b2552ab554752d9a77e1f48f738cca79b Aleksey Kulikov <skinny.mind@gmail.com> 1626091054 +0300	commit: edit feature file
+fc38877b2552ab554752d9a77e1f48f738cca79b 5aecfa0fb97eadaac050ccb99f03c3fb65460ad4 Aleksey Kulikov <skinny.mind@gmail.com> 1626091274 +0300	commit: add another feature file

test/assets/mergerepo/.gitdir/logs/refs/heads/master

@@ -0,0 +1,5 @@
+0000000000000000000000000000000000000000 f17d0d48eae3aa08cecf29128a35e310c97b3521 Aleksey Kulikov <skinny.mind@gmail.com> 1626090830 +0300	commit (initial): init
+f17d0d48eae3aa08cecf29128a35e310c97b3521 c68ff54aabf660fcdd9a2838d401583fe31249e3 Aleksey Kulikov <skinny.mind@gmail.com> 1626091171 +0300	commit: add .gitignore
+c68ff54aabf660fcdd9a2838d401583fe31249e3 78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 Aleksey Kulikov <skinny.mind@gmail.com> 1626091184 +0300	merge feature: Merge made by the 'recursive' strategy.
+78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8 821ed6e80627b8769d170a293862f9fc60825226 Aleksey Kulikov <skinny.mind@gmail.com> 1630568461 +0300	commit: add subdirectory file
+821ed6e80627b8769d170a293862f9fc60825226 14905459d775f3f56a39ebc2ff081163f7da3529 Aleksey Kulikov <skinny.mind@gmail.com> 1631172175 +0300	commit: master conflict commit

test/assets/mergerepo/.gitdir/objects/47/af50e6a799d7d0dde6630d2644f9484fb670f7

@@ -0,0 +1,6 @@
+x
¥ŽK
+Â0Ego.”ä¥ù<C2A5>ˆŽ]Eš¾jh’J›
+ݽ
—àôp8÷†%çX
{wª+<11>è½ìuà
+Q*ÓÐ(Œ4(¬”ƒ"ë¸Eöö+•
+<05>š,×hk´k*÷è¤Õ8¹)è涌f~¯¯e…{¢y£{Šóò<C3B3>Ë6ÇRŽ.Ç2ÞžÙÇÔ…%_Ah)D›T
+Î\rÎmG+ý‘h<E28098>2¥*«/á¿&ûw<>ND

test/assets/mergerepo/.gitdir/objects/5a/ecfa0fb97eadaac050ccb99f03c3fb65460ad4

@@ -0,0 +1,3 @@
+x
¥ÎMNÄ0@aÖ9…÷H£ü6±„¬9…;LÔ¦A<C2A6>inOïÀö->½2zol0/ó<10>äl­ˆ&k¬AÄ1j.Þ/œ‹&´˜PýÐ!û„Z\J1f‚¥‚<>Á2RŒbªO5ºT
+EÌŠÎy|n²>ä	_çÖÖño<>µíûóÖÛÎß<>Úv+£¿ƒYì¢ÑØèáU;­ÕU¯Ñ)ÿ 1ícÞ/¥
+Íó¨mõc¯Q²

test/assets/mergerepo/.gitdir/objects/82/1ed6e80627b8769d170a293862f9fc60825226

@@ -0,0 +1 @@
+x
¥ΞAnΓ Fα®9Εμ#EƒΗ`,EU»ξ)0ό΄ΘΖTGςν›;tϋ<16>^¨¥δNΓθήzΘ;‰ΡΜ°Π<C2B0>‡`ΣδΐΒzIΡLaN"cRΏΎaο4ΉΕ-I™Νζ‰=LΠ
μ^G-b“…Sώμ?µΡη†υΐE_η–Χϊ¤Η±ζ}Ώξ%οργ»ψΌέC-ο¤­°±n΄<6E>n,ΜκU_£<1D> ”<>‘<EFBFBD>s‰Ή!τΪ.Jyƒϊy<>Pα

test/assets/mergerepo/.gitdir/objects/c6/8ff54aabf660fcdd9a2838d401583fe31249e3

@@ -0,0 +1 @@
+x
¥ÎAnà @Ñ®9Åì+Y3€
HQÕ®{Š
Æ.²<>È!•rûäÙþÅÓO½Ö2@[ú§k´Gɉq66¬1¡×~áèç<18>$ëÄ,„Q]ù”6`%—1[/,†}’´ê@Ú³™Å¦à¢™5)¾<>¿~ÂÏ!ûMð{?ÊÞÿárÛKk<4B>©––¿·Êå˜R¯_@‹^09‚O4ˆêU_£CÞ çÓVFÙZ?E=
Ý<Mj

test/assets/mergerepo/.gitdir/objects/fc/38877b2552ab554752d9a77e1f48f738cca79b

@@ -0,0 +1 @@
+x
¥<>KnΓ0³Φ)ΈΠ4υ‚Ά]χϊP<CF8A>`Λ.l9€o_ί΅Ϋ·<CEAB>™—ΦΦjbΎυMΨfΦ%<0E>#<19>µ+h¬σVƒΗ!Za²κ7l²t0)&"Ρθ³%«]<5D><>\φ…<CF86>•ΰΨD<CEA8>‰ΩE<15>ώZ7ψ<37>eΪε„οc®Σϊ†η>Υe9­.ωσ§…:?<3F>Ϊ>`0tιΤwΥµ^΅]ώ<>P’―«EB?6<>RgQϋM§

test/assets/mergerepo/.gitdir/refs/heads/conflict-branch

@@ -0,0 +1 @@
+47af50e6a799d7d0dde6630d2644f9484fb670f7

test/assets/mergerepo/.gitdir/refs/heads/feature

@@ -0,0 +1 @@
+5aecfa0fb97eadaac050ccb99f03c3fb65460ad4

test/assets/mergerepo/.gitdir/refs/heads/master

@@ -0,0 +1 @@
+14905459d775f3f56a39ebc2ff081163f7da3529

test/assets/mergerepo/.gitdir/refs/tags/v0.1

@@ -0,0 +1 @@
+78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8

test/assets/mergerepo/.gitdir/refs/tags/v0.2

@@ -0,0 +1 @@
+f0fdbf506397e9f58c59b88dfdd72778ec06cc0c

test/assets/mergerepo/conflict_file

@@ -0,0 +1 @@
+master conflict edit

test/assets/mergerepo/feature_file

@@ -0,0 +1 @@
+Feature edit

test/assets/mergerepo/gitignore

@@ -0,0 +1 @@
+*.swp

test/merge_test.dart

@@ -1,18 +1,19 @@
 import 'dart:io';
 import 'package:test/test.dart';
 import 'package:libgit2dart/libgit2dart.dart';
+import 'package:libgit2dart/src/git_types.dart';
 import 'helpers/util.dart';
 
 void main() {
   late Repository repo;
-  final tmpDir = '${Directory.systemTemp.path}/merge_testrepo/';
+  final tmpDir = '${Directory.systemTemp.path}/mergerepo/';
 
   setUp(() async {
     if (await Directory(tmpDir).exists()) {
       await Directory(tmpDir).delete(recursive: true);
     }
     await copyRepo(
-      from: Directory('test/assets/testrepo/'),
+      from: Directory('test/assets/mergerepo/'),
       to: await Directory(tmpDir).create(),
     );
     repo = Repository.open(tmpDir);
@@ -28,8 +29,8 @@ void main() {
       test('is up to date when no reference is provided', () {
         final commit =
             repo['c68ff54aabf660fcdd9a2838d401583fe31249e3'] as Commit;
-        final result = repo.mergeAnalysis(commit.id);
 
+        final result = repo.mergeAnalysis(commit.id);
         expect(result[0], GitMergeAnalysis.upToDate.value);
         expect(repo.status, isEmpty);
 
@@ -39,8 +40,8 @@ void main() {
       test('is up to date for provided ref', () {
         final commit =
             repo['c68ff54aabf660fcdd9a2838d401583fe31249e3'] as Commit;
-        final result = repo.mergeAnalysis(commit.id, 'refs/tags/v0.1');
 
+        final result = repo.mergeAnalysis(commit.id, 'refs/tags/v0.1');
         expect(result[0], GitMergeAnalysis.upToDate.value);
         expect(repo.status, isEmpty);
 
@@ -58,7 +59,6 @@ void main() {
         );
 
         final result = repo.mergeAnalysis(theirHead.id, ffBranch.name);
-
         expect(
           result[0],
           GitMergeAnalysis.fastForward.value + GitMergeAnalysis.normal.value,
@@ -73,13 +73,174 @@ void main() {
       test('is not fast forward and there is no conflicts', () {
         final commit =
             repo['5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'] as Commit;
-        final result = repo.mergeAnalysis(commit.id);
 
+        final result = repo.mergeAnalysis(commit.id);
         expect(result[0], GitMergeAnalysis.normal.value);
         expect(repo.status, isEmpty);
 
         commit.free();
       });
     });
+
+    test('writes conflicts to index', () {
+      final conflictBranch = repo.branches['conflict-branch'];
+      final index = repo.index;
+
+      final result = repo.mergeAnalysis(conflictBranch.target);
+      expect(result[0], GitMergeAnalysis.normal.value);
+
+      repo.merge(conflictBranch.target);
+      expect(index.hasConflicts, true);
+      expect(index.conflicts.length, 1);
+      expect(repo.state, GitRepositoryState.merge.value);
+      expect(repo.status, {'conflict_file': GitStatus.conflicted.value});
+
+      final conflictedFile = index.conflicts['conflict_file']!;
+      expect(conflictedFile.ancestor, null);
+      expect(conflictedFile.our?.path, 'conflict_file');
+      expect(conflictedFile.their?.path, 'conflict_file');
+
+      index.add('conflict_file');
+      index.write();
+      expect(index.hasConflicts, false);
+      expect(index.conflicts, isEmpty);
+      expect(repo.status, {'conflict_file': GitStatus.indexModified.value});
+
+      index.free();
+      conflictBranch.free();
+    });
+
+    test('successfully removes conflicts', () {
+      final conflictBranch = repo.branches['conflict-branch'];
+      final index = repo.index;
+
+      repo.merge(conflictBranch.target);
+      expect(index.hasConflicts, true);
+      expect(index.conflicts.length, 1);
+
+      final conflictedFile = index.conflicts['conflict_file']!;
+      conflictedFile.remove();
+      expect(index.hasConflicts, false);
+      expect(index.conflicts, isEmpty);
+      expect(index.conflicts['conflict_file'], null);
+
+      index.free();
+      conflictBranch.free();
+    });
+
+    group('merge commits', () {
+      test('successfully merges with default values', () {
+        final theirCommit =
+            repo['5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'] as Commit;
+        final ourCommit =
+            repo['14905459d775f3f56a39ebc2ff081163f7da3529'] as Commit;
+
+        final mergeIndex = repo.mergeCommits(
+          ourCommit: ourCommit,
+          theirCommit: theirCommit,
+        );
+        expect(mergeIndex.conflicts, isEmpty);
+        final mergeCommitsTree = mergeIndex.writeTree(repo);
+
+        repo.merge(theirCommit.id);
+        final index = repo.index;
+        expect(index.conflicts, isEmpty);
+        final mergeTree = index.writeTree();
+
+        expect(mergeCommitsTree == mergeTree, true);
+
+        index.free();
+        mergeIndex.free();
+        ourCommit.free();
+        theirCommit.free();
+      });
+
+      test('successfully merges with provided favor', () {
+        final theirCommit =
+            repo['5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'] as Commit;
+        final ourCommit =
+            repo['14905459d775f3f56a39ebc2ff081163f7da3529'] as Commit;
+
+        final mergeIndex = repo.mergeCommits(
+          ourCommit: ourCommit,
+          theirCommit: theirCommit,
+          favor: GitMergeFileFavor.ours,
+        );
+        expect(mergeIndex.conflicts, isEmpty);
+
+        mergeIndex.free();
+        ourCommit.free();
+        theirCommit.free();
+      });
+    });
+
+    group('merge trees', () {
+      test('successfully merges with default values', () {
+        final theirCommit =
+            repo['5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'] as Commit;
+        final ourCommit =
+            repo['14905459d775f3f56a39ebc2ff081163f7da3529'] as Commit;
+        final baseCommit =
+            repo[repo.mergeBase(ourCommit.id.sha, theirCommit.id.sha).sha]
+                as Commit;
+        final theirTree = repo[theirCommit.tree.sha] as Tree;
+        final ourTree = repo[ourCommit.tree.sha] as Tree;
+        final ancestorTree = repo[baseCommit.tree.sha] as Tree;
+
+        final mergeIndex = repo.mergeTrees(
+          ancestorTree: ancestorTree,
+          ourTree: ourTree,
+          theirTree: theirTree,
+        );
+        expect(mergeIndex.conflicts, isEmpty);
+        final mergeTreesTree = mergeIndex.writeTree(repo);
+
+        repo.setHead('14905459d775f3f56a39ebc2ff081163f7da3529');
+        repo.merge(theirCommit.id);
+        final index = repo.index;
+        expect(index.conflicts, isEmpty);
+        final mergeTree = index.writeTree();
+
+        expect(mergeTreesTree == mergeTree, true);
+
+        index.free();
+        mergeIndex.free();
+        ancestorTree.free();
+        ourTree.free();
+        theirTree.free();
+        baseCommit.free();
+        ourCommit.free();
+        theirCommit.free();
+      });
+
+      test('successfully merges with provided favor', () {
+        final theirCommit =
+            repo['5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'] as Commit;
+        final ourCommit =
+            repo['14905459d775f3f56a39ebc2ff081163f7da3529'] as Commit;
+        final baseCommit =
+            repo[repo.mergeBase(ourCommit.id.sha, theirCommit.id.sha).sha]
+                as Commit;
+        final theirTree = repo[theirCommit.tree.sha] as Tree;
+        final ourTree = repo[ourCommit.tree.sha] as Tree;
+        final ancestorTree = repo[baseCommit.tree.sha] as Tree;
+
+        final mergeIndex = repo.mergeTrees(
+          ancestorTree: ancestorTree,
+          ourTree: ourTree,
+          theirTree: theirTree,
+          favor: GitMergeFileFavor.ours,
+        );
+        expect(mergeIndex.conflicts, isEmpty);
+
+        mergeIndex.free();
+        ancestorTree.free();
+        ourTree.free();
+        theirTree.free();
+        baseCommit.free();
+        ourCommit.free();
+        theirCommit.free();
+      });
+    });
   });
 }