mirror of
https://github.com/git/git.git
synced 2024-05-26 05:56:11 +02:00
Merge branch 'maint'
* maint: revision traversal: --unpacked does not limit commit list anymore. Continue traversal when rev-list --unpacked finds a packed commit. Use memmove instead of memcpy for overlapping areas quote.c: ensure the same quoting across platforms. Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"
This commit is contained in:
commit
83877f8d92
5
blame.c
5
blame.c
|
@ -19,7 +19,9 @@
|
||||||
#include "xdiff-interface.h"
|
#include "xdiff-interface.h"
|
||||||
#include "quote.h"
|
#include "quote.h"
|
||||||
|
|
||||||
|
#ifndef DEBUG
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
||||||
|
#endif
|
||||||
|
|
||||||
static const char blame_usage[] =
|
static const char blame_usage[] =
|
||||||
"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-S <revs-file>] [--] file [commit]\n"
|
"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-S <revs-file>] [--] file [commit]\n"
|
||||||
|
@ -232,6 +234,9 @@ static void print_map(struct commit *cmit, struct commit *other)
|
||||||
util2->num_lines ? util->num_lines : util2->num_lines;
|
util2->num_lines ? util->num_lines : util2->num_lines;
|
||||||
int num;
|
int num;
|
||||||
|
|
||||||
|
if (print_map == NULL)
|
||||||
|
; /* to avoid "unused function" warning */
|
||||||
|
|
||||||
for (i = 0; i < max; i++) {
|
for (i = 0; i < max; i++) {
|
||||||
printf("i: %d ", i);
|
printf("i: %d ", i);
|
||||||
num = -1;
|
num = -1;
|
||||||
|
|
|
@ -2,7 +2,9 @@
|
||||||
#include "tree.h"
|
#include "tree.h"
|
||||||
#include "cache-tree.h"
|
#include "cache-tree.h"
|
||||||
|
|
||||||
|
#ifndef DEBUG
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
||||||
|
#endif
|
||||||
|
|
||||||
struct cache_tree *cache_tree(void)
|
struct cache_tree *cache_tree(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -272,7 +272,7 @@ buffer_gets( buffer_t * b, char **s )
|
||||||
n = b->bytes - start;
|
n = b->bytes - start;
|
||||||
|
|
||||||
if (n)
|
if (n)
|
||||||
memcpy( b->buf, b->buf + start, n );
|
memmove(b->buf, b->buf + start, n);
|
||||||
b->offset -= start;
|
b->offset -= start;
|
||||||
b->bytes = n;
|
b->bytes = n;
|
||||||
start = 0;
|
start = 0;
|
||||||
|
|
2
quote.c
2
quote.c
|
@ -209,7 +209,7 @@ static int quote_c_style_counted(const char *name, int namelen,
|
||||||
if (!ch)
|
if (!ch)
|
||||||
break;
|
break;
|
||||||
if ((ch < ' ') || (ch == '"') || (ch == '\\') ||
|
if ((ch < ' ') || (ch == '"') || (ch == '\\') ||
|
||||||
(ch == 0177)) {
|
(ch >= 0177)) {
|
||||||
needquote = 1;
|
needquote = 1;
|
||||||
switch (ch) {
|
switch (ch) {
|
||||||
case '\a': EMITQ(); ch = 'a'; break;
|
case '\a': EMITQ(); ch = 'a'; break;
|
||||||
|
|
16
revision.c
16
revision.c
|
@ -418,9 +418,6 @@ static void limit_list(struct rev_info *revs)
|
||||||
|
|
||||||
if (revs->max_age != -1 && (commit->date < revs->max_age))
|
if (revs->max_age != -1 && (commit->date < revs->max_age))
|
||||||
obj->flags |= UNINTERESTING;
|
obj->flags |= UNINTERESTING;
|
||||||
if (revs->unpacked &&
|
|
||||||
has_sha1_pack(obj->sha1, revs->ignore_packed))
|
|
||||||
obj->flags |= UNINTERESTING;
|
|
||||||
add_parents_to_list(revs, commit, &list);
|
add_parents_to_list(revs, commit, &list);
|
||||||
if (obj->flags & UNINTERESTING) {
|
if (obj->flags & UNINTERESTING) {
|
||||||
mark_parents_uninteresting(commit);
|
mark_parents_uninteresting(commit);
|
||||||
|
@ -1015,7 +1012,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
|
||||||
add_pending_object(revs, object, def);
|
add_pending_object(revs, object, def);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (revs->topo_order || revs->unpacked)
|
if (revs->topo_order)
|
||||||
revs->limited = 1;
|
revs->limited = 1;
|
||||||
|
|
||||||
if (revs->prune_data) {
|
if (revs->prune_data) {
|
||||||
|
@ -1149,17 +1146,18 @@ struct commit *get_revision(struct rev_info *revs)
|
||||||
* that we'd otherwise have done in limit_list().
|
* that we'd otherwise have done in limit_list().
|
||||||
*/
|
*/
|
||||||
if (!revs->limited) {
|
if (!revs->limited) {
|
||||||
if ((revs->unpacked &&
|
if (revs->max_age != -1 &&
|
||||||
has_sha1_pack(commit->object.sha1,
|
(commit->date < revs->max_age))
|
||||||
revs->ignore_packed)) ||
|
|
||||||
(revs->max_age != -1 &&
|
|
||||||
(commit->date < revs->max_age)))
|
|
||||||
continue;
|
continue;
|
||||||
add_parents_to_list(revs, commit, &revs->commits);
|
add_parents_to_list(revs, commit, &revs->commits);
|
||||||
}
|
}
|
||||||
if (commit->object.flags & SHOWN)
|
if (commit->object.flags & SHOWN)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
if (revs->unpacked && has_sha1_pack(commit->object.sha1,
|
||||||
|
revs->ignore_packed))
|
||||||
|
continue;
|
||||||
|
|
||||||
/* We want to show boundary commits only when their
|
/* We want to show boundary commits only when their
|
||||||
* children are shown. When path-limiter is in effect,
|
* children are shown. When path-limiter is in effect,
|
||||||
* rewrite_parents() drops some commits from getting shown,
|
* rewrite_parents() drops some commits from getting shown,
|
||||||
|
|
Loading…
Reference in New Issue