X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=fast-import.c;h=ddad289dae37c2115f57f88dc207f0d2fa6ab1f3;hb=7e7db5e4520388d3a6f1efbe2f7a29d43bd06a2b;hp=129a786832c2dc863e33ae2fc039a0212c1751d5;hpb=6c6f87842bcb8ac4d36922cec5b5ce25de14756e;p=git.git diff --git a/fast-import.c b/fast-import.c index 129a78683..ddad289da 100644 --- a/fast-import.c +++ b/fast-import.c @@ -267,7 +267,7 @@ struct hash_list typedef enum { WHENSPEC_RAW = 1, WHENSPEC_RFC2822, - WHENSPEC_NOW, + WHENSPEC_NOW } whenspec_type; struct recent_command @@ -1666,7 +1666,7 @@ static void dump_marks_helper(FILE *f, if (m->shift) { for (k = 0; k < 1024; k++) { if (m->data.sets[k]) - dump_marks_helper(f, (base + k) << m->shift, + dump_marks_helper(f, base + (k << m->shift), m->data.sets[k]); } } else {