Re: [PATCH v2 1/3] fast-{import,export}: use get_sha1_hex() directly

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Felipe Contreras <felipe.contreras@xxxxxxxxx> writes:

> Turns out most of the get_sha1() calls were correct; this does the trick:
>
> diff --git a/builtin/fast-export.c b/builtin/fast-export.c
> index 18fdfb3..d1d68e9 100644
> --- a/builtin/fast-export.c
> +++ b/builtin/fast-export.c
> @@ -623,7 +623,7 @@ static void import_marks(char *input_file)
>
>                 mark = strtoumax(line + 1, &mark_end, 10);
>                 if (!mark || mark_end == line + 1
> -                       || *mark_end != ' ' || get_sha1(mark_end + 1, sha1))
> +                       || *mark_end != ' ' || get_sha1_hex(mark_end + 1, sha1))
>                         die("corrupt mark line: %s", line);
>
>                 if (last_idnum < mark)
> diff --git a/fast-import.c b/fast-import.c
> index 5f539d7..3f32149 100644
> --- a/fast-import.c
> +++ b/fast-import.c
> @@ -1822,7 +1822,7 @@ static void read_marks(void)
>                 *end = 0;
>                 mark = strtoumax(line + 1, &end, 10);
>                 if (!mark || end == line + 1
> -                       || *end != ' ' || get_sha1(end + 1, sha1))
> +                       || *end != ' ' || get_sha1_hex(end + 1, sha1))

This is where --import-marks is handled, and we should be seeing

	:markid SHA-1

one per each line (according to Documentation/git-fast-import.txt).
So this one should be get_sha1_hex().

The other one in fast-export.c would be the same.

The other ones in the original patch were reading from the
fast-import stream and shouldn't have insisted on 40-hex.

Will replace the body of the change with only these two hunks and
requeue.  Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]