Re: [RESEND PATCH] fast-import: Cleanup mode setting.
Felipe Contreras <felipe.contreras@gmail.com> wrote:
> "S_IFREG | mode" probably is only required for 0644 and 0755.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Show 36 quoted lines
> ---
> fast-import.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/fast-import.c b/fast-import.c
> index a6bce66..f0e08ac 100644
> --- a/fast-import.c
> +++ b/fast-import.c
> @@ -1872,12 +1872,13 @@ static void file_change_m(struct branch *b)
> if (!p)
> die("Corrupt mode: %s", command_buf.buf);
> switch (mode) {
> + case 0644:
> + case 0755:
> + mode |= S_IFREG;
> case S_IFREG | 0644:
> case S_IFREG | 0755:
> case S_IFLNK:
> case S_IFGITLINK:
> - case 0644:
> - case 0755:
> /* ok */
> break;
> default:
> @@ -1944,7 +1945,7 @@ static void file_change_m(struct branch *b)
> typename(type), command_buf.buf);
> }
>
> - tree_content_set(&b->branch_tree, p, sha1, S_IFREG | mode, NULL);
> + tree_content_set(&b->branch_tree, p, sha1, mode, NULL);
> }
>
> static void file_change_d(struct branch *b)
> --
> 1.6.0.6.5.ga66c
> --
Shawn.
Shawn O. Pearce <spearce@spearce.org>