S_IFLNK != 0140000

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 2be6c4b8070feaf6482e65f6517c1b801c16760d..1fe2c1dcf225d430dc8517c47cc5d48073cd96b3 100644 (file)
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -416,7 +416,7 @@ in octal.  Git only supports the following modes:
   of files in most projects use this mode.  If in doubt, this is
   what you want.
 * `100755` or `755`: A normal, but executable, file.
   of files in most projects use this mode.  If in doubt, this is
   what you want.
 * `100755` or `755`: A normal, but executable, file.

-* `140000`: A symlink, the content of the file will be the link target.
+* `120000`: A symlink, the content of the file will be the link target.

 
 In both formats `<path>` is the complete path of the file to be added
 (if not already existing) or modified (if already existing).
 
 In both formats `<path>` is the complete path of the file to be added
 (if not already existing) or modified (if already existing).

diff --git a/fast-import.c b/fast-import.c
index df84e4d87d3d7c151bd0cdda29b22519e7043c8a..c72c5c7a9453a90e009b542a314c22465ed85f83 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -81,7 +81,7 @@ Format of STDIN stream:
   path_str    ::= path    | '"' quoted(path)    '"' ;
   mode        ::= '100644' | '644'
                 | '100755' | '755'
   path_str    ::= path    | '"' quoted(path)    '"' ;
   mode        ::= '100644' | '644'
                 | '100755' | '755'

-                | '140000'
+                | '120000'

                 ;
 
   declen ::= # unsigned 32 bit value, ascii base10 notation;
                 ;
 
   declen ::= # unsigned 32 bit value, ascii base10 notation;