Merge branch 'en/ort-perf-batch-9'

[thirdparty/git.git] / unpack-trees.c

diff --git a/unpack-trees.c b/unpack-trees.c
index 9298fe1d9b3feb695f3ea6a36e0531e7399f3f23..8a1afbc1e493c2fe1aecb6836246d7560d72b9aa 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -16,6 +16,7 @@
 #include "fsmonitor.h"
 #include "object-store.h"
 #include "promisor-remote.h"
+#include "entry.h"
 
 /*
  * Error messages expected by scripts out of plumbing commands such as
@@ -2097,7 +2098,7 @@ static int verify_absent_1(const struct cache_entry *ce,
        if (o->index_only || o->reset || !o->update)
                return 0;
 
-       len = check_leading_path(ce->name, ce_namelen(ce));
+       len = check_leading_path(ce->name, ce_namelen(ce), 0);
        if (!len)
                return 0;
        else if (len > 0) {
@@ -2563,3 +2564,25 @@ int oneway_merge(const struct cache_entry * const *src,
        }
        return merged_entry(a, old, o);
 }
+
+/*
+ * Merge worktree and untracked entries in a stash entry.
+ *
+ * Ignore all index entries. Collapse remaining trees but make sure that they
+ * don't have any conflicting files.
+ */
+int stash_worktree_untracked_merge(const struct cache_entry * const *src,
+                                  struct unpack_trees_options *o)
+{
+       const struct cache_entry *worktree = src[1];
+       const struct cache_entry *untracked = src[2];
+
+       if (o->merge_size != 2)
+               BUG("invalid merge_size: %d", o->merge_size);
+
+       if (worktree && untracked)
+               return error(_("worktree and untracked commit have duplicate entries: %s"),
+                            super_prefixed(worktree->name));
+
+       return merged_entry(worktree ? worktree : untracked, NULL, o);
+}