about summary refs log tree commit diff
path: root/third_party/git/worktree.h
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/worktree.h
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/worktree.h')
-rw-r--r--third_party/git/worktree.h20
1 files changed, 2 insertions, 18 deletions
diff --git a/third_party/git/worktree.h b/third_party/git/worktree.h
index d242a6e71c03..caecc7a281cc 100644
--- a/third_party/git/worktree.h
+++ b/third_party/git/worktree.h
@@ -44,30 +44,14 @@ int submodule_uses_worktrees(const char *path);
 const char *get_worktree_git_dir(const struct worktree *wt);
 
 /*
- * Search for the worktree identified unambiguously by `arg` -- typically
- * supplied by the user via the command-line -- which may be a pathname or some
- * shorthand uniquely identifying a worktree, thus making it convenient for the
- * user to specify a worktree with minimal typing. For instance, if the last
- * component (say, "foo") of a worktree's pathname is unique among worktrees
- * (say, "work/foo" and "work/bar"), it can be used to identify the worktree
- * unambiguously.
- *
- * `prefix` should be the `prefix` handed to top-level Git commands along with
- * `argc` and `argv`.
- *
- * Return the worktree identified by `arg`, or NULL if not found.
+ * Search a worktree that can be unambiguously identified by
+ * "arg". "prefix" must not be NULL.
  */
 struct worktree *find_worktree(struct worktree **list,
 			       const char *prefix,
 			       const char *arg);
 
 /*
- * Return the worktree corresponding to `path`, or NULL if no such worktree
- * exists.
- */
-struct worktree *find_worktree_by_path(struct worktree **, const char *path);
-
-/*
  * Return true if the given worktree is the main one.
  */
 int is_main_worktree(const struct worktree *wt);