about summary refs log tree commit diff
path: root/third_party/git/diffcore.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/diffcore.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/diffcore.h')
-rw-r--r--third_party/git/diffcore.h32
1 files changed, 0 insertions, 32 deletions
diff --git a/third_party/git/diffcore.h b/third_party/git/diffcore.h
index 7c07347e42b5..b651061c0e3a 100644
--- a/third_party/git/diffcore.h
+++ b/third_party/git/diffcore.h
@@ -28,12 +28,6 @@ struct userdiff_driver;
 
 #define MINIMUM_BREAK_SIZE     400 /* do not break a file smaller than this */
 
-/**
- * the internal representation for a single file (blob).  It records the blob
- * object name (if known -- for a work tree file it typically is a NUL SHA-1),
- * filemode and pathname.  This is what the `diff_addremove()`, `diff_change()`
- * and `diff_unmerge()` synthesize and feed `diff_queue()` function with.
- */
 struct diff_filespec {
 	struct object_id oid;
 	char *path;
@@ -72,17 +66,6 @@ void diff_free_filespec_data(struct diff_filespec *);
 void diff_free_filespec_blob(struct diff_filespec *);
 int diff_filespec_is_binary(struct repository *, struct diff_filespec *);
 
-/**
- * This records a pair of `struct diff_filespec`; the filespec for a file in
- * the "old" set (i.e. preimage) is called `one`, and the filespec for a file
- * in the "new" set (i.e. postimage) is called `two`.  A change that represents
- * file creation has NULL in `one`, and file deletion has NULL in `two`.
- *
- * A `filepair` starts pointing at `one` and `two` that are from the same
- * filename, but `diffcore_std()` can break pairs and match component filespecs
- * with other filespecs from a different filepair to form new filepair. This is
- * called 'rename detection'.
- */
 struct diff_filepair {
 	struct diff_filespec *one;
 	struct diff_filespec *two;
@@ -94,7 +77,6 @@ struct diff_filepair {
 	unsigned done_skip_stat_unmatch : 1;
 	unsigned skip_stat_unmatch_result : 1;
 };
-
 #define DIFF_PAIR_UNMERGED(p) ((p)->is_unmerged)
 
 #define DIFF_PAIR_RENAME(p) ((p)->renamed_pair)
@@ -112,25 +94,11 @@ void diff_free_filepair(struct diff_filepair *);
 
 int diff_unmodified_pair(struct diff_filepair *);
 
-/**
- * This is a collection of filepairs.  Notable members are:
- *
- * - `queue`:
- * An array of pointers to `struct diff_filepair`. This dynamically grows as
- * you add filepairs;
- *
- * - `alloc`:
- * The allocated size of the `queue` array;
- *
- * - `nr`:
- * The number of elements in the `queue` array.
- */
 struct diff_queue_struct {
 	struct diff_filepair **queue;
 	int alloc;
 	int nr;
 };
-
 #define DIFF_QUEUE_CLEAR(q) \
 	do { \
 		(q)->queue = NULL; \