mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fast-import: Cleanup mode setting.

Browse Source 
"S_IFREG | mode" makes only sense for 0644 and 0755.

Even though doing (S_IFREG | mode) may not hurt when mode is any other
supported value, that is only true because S_IFREG mode bit happens to
be already on for S_IFLNK or S_IFGITLINK.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras
2009-01-14 03:37:07 +02:00
committed by Junio C Hamano
parent 8faea4f3b2
commit 3d1d81eba2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fast-import.c
View File

@ -1868,12 +1868,13 @@ static void file_change_m(struct branch *b)
if (!p) if (!p)
die("Corrupt mode: %s", command_buf.buf); die("Corrupt mode: %s", command_buf.buf);
switch (mode) { switch (mode) {
case 0644:
case 0755:
mode |= S_IFREG;
case S_IFREG | 0644: case S_IFREG | 0644:
case S_IFREG | 0755: case S_IFREG | 0755:
case S_IFLNK: case S_IFLNK:
case S_IFGITLINK: case S_IFGITLINK:
case 0644:
case 0755:
/* ok */ /* ok */
break; break;
default: default:
@ -1940,7 +1941,7 @@ static void file_change_m(struct branch *b)
typename(type), command_buf.buf); 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) static void file_change_d(struct branch *b)