diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-02-06 12:46:11 -0800 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2007-02-06 16:08:30 -0500 |
| commit | 9981b6d915a49d325f790f2aa825aa56ae4ac85c (patch) | |
| tree | 9b793218aabc4f7a7c15d7c9b9848463408c4588 | |
| parent | Don't do non-fastforward updates in fast-import. (diff) | |
| download | tgif-9981b6d915a49d325f790f2aa825aa56ae4ac85c.tar.xz | |
S_IFLNK != 0140000
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rw-r--r-- | Documentation/git-fast-import.txt | 2 | ||||
| -rw-r--r-- | fast-import.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 2be6c4b807..1fe2c1dcf2 100644 --- 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. -* `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). diff --git a/fast-import.c b/fast-import.c index df84e4d87d..c72c5c7a94 100644 --- 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' - | '140000' + | '120000' ; declen ::= # unsigned 32 bit value, ascii base10 notation; |