parent
89438677ab
commit
82f9d58a39
2
date.c
2
date.c
|
@ -326,7 +326,7 @@ static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* NOTE! We will give precedence to day-of-month over month or
|
* NOTE! We will give precedence to day-of-month over month or
|
||||||
* year numebers in the 1-12 range. So 05 is always "mday 5",
|
* year numbers in the 1-12 range. So 05 is always "mday 5",
|
||||||
* unless we already have a mday..
|
* unless we already have a mday..
|
||||||
*
|
*
|
||||||
* IOW, 01 Apr 05 parses as "April 1st, 2005".
|
* IOW, 01 Apr 05 parses as "April 1st, 2005".
|
||||||
|
|
|
@ -116,7 +116,7 @@ static int diff_cache(struct cache_entry **ac, int entries, const char **pathspe
|
||||||
/* We come here with ce pointing at stage 1
|
/* We come here with ce pointing at stage 1
|
||||||
* (original tree) and ac[1] pointing at stage
|
* (original tree) and ac[1] pointing at stage
|
||||||
* 3 (unmerged). show-modified with
|
* 3 (unmerged). show-modified with
|
||||||
* report-mising set to false does not say the
|
* report-missing set to false does not say the
|
||||||
* file is deleted but reports true if work
|
* file is deleted but reports true if work
|
||||||
* tree does not have it, in which case we
|
* tree does not have it, in which case we
|
||||||
* fall through to report the unmerged state.
|
* fall through to report the unmerged state.
|
||||||
|
|
2
diff.c
2
diff.c
|
@ -787,7 +787,7 @@ int diff_setup_done(struct diff_options *options)
|
||||||
* so it is safe for us to do this here. Also
|
* so it is safe for us to do this here. Also
|
||||||
* it does not smudge active_cache or active_nr
|
* it does not smudge active_cache or active_nr
|
||||||
* when it fails, so we do not have to worry about
|
* when it fails, so we do not have to worry about
|
||||||
* cleaning it up oufselves either.
|
* cleaning it up ourselves either.
|
||||||
*/
|
*/
|
||||||
read_cache();
|
read_cache();
|
||||||
}
|
}
|
||||||
|
|
2
epoch.c
2
epoch.c
|
@ -190,7 +190,7 @@ static void free_mass_counter(struct mass_counter *counter)
|
||||||
* enqueued, enqueuing the commit in a list of pending commits, in latest
|
* enqueued, enqueuing the commit in a list of pending commits, in latest
|
||||||
* commit date first order.
|
* commit date first order.
|
||||||
*
|
*
|
||||||
* The algorithm then preceeds to visit each commit in the pending queue.
|
* The algorithm then proceeds to visit each commit in the pending queue.
|
||||||
* Upon each visit, the pending mass is added to the mass already seen for that
|
* Upon each visit, the pending mass is added to the mass already seen for that
|
||||||
* commit and then divided into N equal portions, where N is the number of
|
* commit and then divided into N equal portions, where N is the number of
|
||||||
* parents of the commit being visited. The divided portions are then injected
|
* parents of the commit being visited. The divided portions are then injected
|
||||||
|
|
2
ident.c
2
ident.c
|
@ -140,7 +140,7 @@ static int copy(char *buf, int size, int offset, const char *src)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copy the rest to the buffer, but avoid the special
|
* Copy the rest to the buffer, but avoid the special
|
||||||
* characters '\n' '<' and '>' that act as delimeters on
|
* characters '\n' '<' and '>' that act as delimiters on
|
||||||
* a identification line
|
* a identification line
|
||||||
*/
|
*/
|
||||||
for (i = 0; i < len; i++) {
|
for (i = 0; i < len; i++) {
|
||||||
|
|
|
@ -169,7 +169,7 @@ static int excluded_1(const char *pathname,
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* match with FNM_PATHNAME:
|
/* match with FNM_PATHNAME:
|
||||||
* exclude has base (baselen long) inplicitly
|
* exclude has base (baselen long) implicitly
|
||||||
* in front of it.
|
* in front of it.
|
||||||
*/
|
*/
|
||||||
int baselen = x->baselen;
|
int baselen = x->baselen;
|
||||||
|
|
|
@ -119,7 +119,7 @@ static unsigned long write_one(struct sha1file *f,
|
||||||
return offset;
|
return offset;
|
||||||
e->offset = offset;
|
e->offset = offset;
|
||||||
offset += write_object(f, e);
|
offset += write_object(f, e);
|
||||||
/* if we are delitified, write out its base object. */
|
/* if we are deltified, write out its base object. */
|
||||||
if (e->delta)
|
if (e->delta)
|
||||||
offset = write_one(f, e->delta, offset);
|
offset = write_one(f, e->delta, offset);
|
||||||
return offset;
|
return offset;
|
||||||
|
|
Loading…
Reference in New Issue