mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-08 19:06:20 +02:00
Code

combine-diff: add a bit more comments. 

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-01-30 16:34:29 -08:00
parent 30d08b34aa
commit b469d8b6f7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
combine-diff.c
View File

@ -68,6 +68,7 @@ static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr,
return curr;
}
/* Lines lost from parent */
struct lline {
struct lline *next;
int len;
@ -75,10 +76,15 @@ struct lline {
char line[FLEX_ARRAY];
};
/* Lines surviving in the merge result */
struct sline {
struct lline *lost_head, **lost_tail;
char *bol;
int len;
/* bit 0 up to (N-1) are on if the parent does _not_
* have this line (i.e. we changed it).
* bit N is used for "interesting" lines, including context.
*/
unsigned long flag;
};
@ -242,7 +248,7 @@ static void combine_diff(const unsigned char *parent, const char *ourtmp,
continue;
}
if (!lost_bucket)
continue;
continue; /* not in any hunk yet */
switch (line[0]) {
case '-':
append_lost(lost_bucket, n, line+1);