From 55be2525c25cb6b7434ed55e8a53afef655ba9a8 Mon Sep 17 00:00:00 2001 From: dongxiancun Date: Mon, 17 Jun 2019 16:27:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Mod=20=20aaa-12=20=E4=BF=AE=E6=94=B9Windows?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=96=B9=E6=B3=95=E4=B8=80=EF=BC=9A?= =?UTF-8?q?=E9=80=82=E7=94=A8=E4=BA=8E=E4=B8=8D=E5=9C=A8windows=E4=B8=8B?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E3=80=81=E7=BC=96=E8=BE=91linux=E5=86=85?= =?UTF-8?q?=E6=A0=B8=E4=BB=A3=E7=A0=81=E7=9A=84=E5=BC=80=E5=8F=91=E4=BA=BA?= =?UTF-8?q?=E5=91=98=20RCA=EF=BC=9A=20SOL=EF=BC=9A=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=BA=EF=BC=9Adongxiancun=20=E6=A3=80=E8=A7=86=E4=BA=BA?= =?UTF-8?q?=EF=BC=9Adongxiancun?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Readme.md | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 2f3e6fa54..585f11f3e 100755 --- a/Readme.md +++ b/Readme.md @@ -117,8 +117,33 @@ sGATE_GIT_VERS 记录了当前源码在 gitlab 服务器上面的版本信息 #### 7. Windows 开发环境搭建 -+ 解决 git 出错的方法 ++ 解决 git 出错的方法一(**适用于不在windows下查看、编辑linux内核代码的开发人员**) +1. 说明 + **windows操作系统git下载克隆(或屏蔽)部分文件代码的方法** + 使用以下代码的重点是,不能使用POWERSHELL/CMD,只能使用git bash,如果在POWERSHELL/CMD中操作,在最后一步命令的时候会报以下错误: + error: Sparse checkout leaves no entry on working directory +2. 准备工作:启用git的sparse checkout功能(要求Cit 1.7+版本) + + ```shell + mkdir secogateway + cd secogateway + git init + git remote add -f http://git.komect.net/ISG/secogateway.git + git config core.sparsecheckout true + ``` +3. 设置检出的过滤规则:示例屏蔽kernel文件夹 + + ```shell + echo '/*' >> .git/info/sparse-checkout #这一步不可省略 + echo '!/kernel/' >> .git/info/sparse-checkout + ``` +4. 命令行 执行检出:(或使用TortoiseGit等图形化工具,执行检出) + + ```shell + git checkout master + ``` ++ 解决 git 出错的方法二 1. 下载并安装 [cygwin](http://cygwin.com/install.html) 2. 运行安装程序 ![安装界面](./docs/img/1.PNG) 3. 在源选择界面中按图添加163源 ![源设置界面](./docs/img/6.PNG) From 509fef0b3920ba2360f44295907e470d63e4783c Mon Sep 17 00:00:00 2001 From: dongxiancun Date: Mon, 17 Jun 2019 16:35:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Mod=20=20aaa-12=20=E4=BF=AE=E6=94=B9Windows?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=96=B9=E6=B3=95=E4=B8=80=EF=BC=9A?= =?UTF-8?q?=E9=80=82=E7=94=A8=E4=BA=8E=E4=B8=8D=E5=9C=A8windows=E4=B8=8B?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E3=80=81=E7=BC=96=E8=BE=91linux=E5=86=85?= =?UTF-8?q?=E6=A0=B8=E4=BB=A3=E7=A0=81=E7=9A=84=E5=BC=80=E5=8F=91=E4=BA=BA?= =?UTF-8?q?=E5=91=98=20RCA=EF=BC=9A=20SOL=EF=BC=9A=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=BA=EF=BC=9Adongxiancun=20=E6=A3=80=E8=A7=86=E4=BA=BA?= =?UTF-8?q?=EF=BC=9Adongxiancun?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 4cc8593e3..39df419a3 100755 --- a/Readme.md +++ b/Readme.md @@ -117,7 +117,7 @@ sGATE_GIT_VERS 记录了当前源码在 gitlab 服务器上面的版本信息 #### 7. Windows 开发环境搭建 -+ 解决 git 出错的方法一(**适用于不在windows下查看、编辑linux内核代码的开发人员**) ++ 解决 git 出错的方法一(**适用于不在windows下查看、编辑linux内核代码的开发人员**) 1. 说明 **windows操作系统git下载克隆(或屏蔽)部分文件代码的方法** 使用以下代码的重点是,不能使用POWERSHELL/CMD,只能使用git bash,如果在POWERSHELL/CMD中操作,在最后一步命令的时候会报以下错误: From 45f31ee305163ea930d06b147b930f80d9d8e8ec Mon Sep 17 00:00:00 2001 From: dongxiancun Date: Mon, 17 Jun 2019 16:38:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Mod=20=20aaa-12=20=E4=BF=AE=E6=94=B9Windows?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=96=B9=E6=B3=95=E4=B8=80=EF=BC=9A?= =?UTF-8?q?=E9=80=82=E7=94=A8=E4=BA=8E=E4=B8=8D=E5=9C=A8windows=E4=B8=8B?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E3=80=81=E7=BC=96=E8=BE=91linux=E5=86=85?= =?UTF-8?q?=E6=A0=B8=E4=BB=A3=E7=A0=81=E7=9A=84=E5=BC=80=E5=8F=91=E4=BA=BA?= =?UTF-8?q?=E5=91=98=20RCA=EF=BC=9A=20SOL=EF=BC=9A=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=BA=EF=BC=9Adongxiancun=20=E6=A3=80=E8=A7=86=E4=BA=BA?= =?UTF-8?q?=EF=BC=9Adongxiancun?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Readme.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Readme.md b/Readme.md index 39df419a3..61d115923 100755 --- a/Readme.md +++ b/Readme.md @@ -124,24 +124,24 @@ sGATE_GIT_VERS 记录了当前源码在 gitlab 服务器上面的版本信息 error: Sparse checkout leaves no entry on working directory 2. 准备工作:启用git的sparse checkout功能(要求Cit 1.7+版本) - ```shell +
         mkdir secogateway
         cd secogateway
         git init
         git remote add -f http://git.komect.net/ISG/secogateway.git
         git config core.sparsecheckout true
-        ```
+        
3. 设置检出的过滤规则:示例屏蔽kernel文件夹 - ```shell +
         echo '/*' >> .git/info/sparse-checkout #这一步不可省略
         echo '!/kernel/' >> .git/info/sparse-checkout
-        ```
+        
4. 命令行 执行检出:(或使用TortoiseGit等图形化工具,执行检出) - ```shell +
         git checkout master
-        ```
+        
+ 解决 git 出错的方法二 1. 下载并安装 [cygwin](http://cygwin.com/install.html)