Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
348c4c66
G
git
项目概览
李少辉-开发者
/
git
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
git
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
348c4c66
编写于
9月 23, 2005
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge 'fixes' branch.
Signed-off-by:
N
Junio C Hamano
<
junkio@cox.net
>
上级
7fe2fc79
dc56bc03
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
49 addition
and
39 deletion
+49
-39
.gitignore
.gitignore
+4
-0
Documentation/git-diff-tree.txt
Documentation/git-diff-tree.txt
+4
-1
compat/subprocess.py
compat/subprocess.py
+4
-23
fetch.c
fetch.c
+2
-0
local-fetch.c
local-fetch.c
+30
-10
rsh.c
rsh.c
+5
-5
未找到文件。
.gitignore
浏览文件 @
348c4c66
...
...
@@ -93,3 +93,7 @@ git-verify-pack
git-verify-tag
git-whatchanged
git-write-tree
#*.tar.gz
#*.dsc
#*.deb
#git-core.spec
Documentation/git-diff-tree.txt
浏览文件 @
348c4c66
...
...
@@ -9,12 +9,15 @@ git-diff-tree - Compares the content and mode of blobs found via two tree object
SYNOPSIS
--------
'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [<common diff options>] <tree-ish>
<tree-ish>
[<path>...]
'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [<common diff options>] <tree-ish>
[<tree-ish>]
[<path>...]
DESCRIPTION
-----------
Compares the content and mode of the blobs found via two tree objects.
If there is only one <tree-ish> given, the commit is compared with its parents
(see --stdin below).
Note that "git-diff-tree" can use the tree encapsulated in a commit object.
OPTIONS
...
...
compat/subprocess.py
浏览文件 @
348c4c66
...
...
@@ -2,31 +2,12 @@
#
# For more information about this module, see PEP 324.
#
#
Copyright (c) 2003-2004 by Peter Astrand <astrand@lysator.liu.se>
#
This module should remain compatible with Python 2.2, see PEP 291.
#
# By obtaining, using, and/or copying this software and/or its
# associated documentation, you agree that you have read, understood,
# and will comply with the following terms and conditions:
#
# Permission to use, copy, modify, and distribute this software and
# its associated documentation for any purpose and without fee is
# hereby granted, provided that the above copyright notice appears in
# all copies, and that both that copyright notice and this permission
# notice appear in supporting documentation, and that the name of the
# author not be used in advertising or publicity pertaining to
# distribution of the software without specific, written prior
# permission.
#
# THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
# Use of this file within git is permitted under GPLv2.
# Copyright (c) 2003-2005 by Peter Astrand <astrand@lysator.liu.se>
#
# Licensed to PSF under a Contributor Agreement.
# See http://www.python.org/2.4/license for licensing details.
r
"""subprocess - Subprocesses with accessible I/O streams
...
...
fetch.c
浏览文件 @
348c4c66
...
...
@@ -48,6 +48,7 @@ static int process_tree(struct tree *tree)
struct
tree_entry_list
*
next
=
entry
->
next
;
if
(
process
(
entry
->
item
.
any
))
return
-
1
;
free
(
entry
->
name
);
free
(
entry
);
entry
=
next
;
}
...
...
@@ -206,6 +207,7 @@ int pull(char *target)
int
fd
=
-
1
;
save_commit_buffer
=
0
;
track_object_refs
=
0
;
if
(
write_ref
&&
current_ref
)
{
fd
=
lock_ref_sha1
(
write_ref
,
current_ref
);
if
(
fd
<
0
)
...
...
local-fetch.c
浏览文件 @
348c4c66
...
...
@@ -38,6 +38,8 @@ static int setup_indices(void)
unsigned
char
sha1
[
20
];
sprintf
(
filename
,
"%s/objects/pack/"
,
path
);
dir
=
opendir
(
filename
);
if
(
!
dir
)
return
-
1
;
while
((
de
=
readdir
(
dir
))
!=
NULL
)
{
int
namelen
=
strlen
(
de
->
d_name
);
if
(
namelen
!=
50
||
...
...
@@ -46,10 +48,12 @@ static int setup_indices(void)
get_sha1_hex
(
de
->
d_name
+
5
,
sha1
);
setup_index
(
sha1
);
}
closedir
(
dir
);
return
0
;
}
static
int
copy_file
(
const
char
*
source
,
const
char
*
dest
,
const
char
*
hex
)
static
int
copy_file
(
const
char
*
source
,
const
char
*
dest
,
const
char
*
hex
,
int
warn_if_not_exists
)
{
if
(
use_link
)
{
if
(
!
link
(
source
,
dest
))
{
...
...
@@ -58,13 +62,24 @@ static int copy_file(const char *source, const char *dest, const char *hex)
}
/* If we got ENOENT there is no point continuing. */
if
(
errno
==
ENOENT
)
{
fprintf
(
stderr
,
"does not exist %s
\n
"
,
source
);
if
(
warn_if_not_exists
)
fprintf
(
stderr
,
"does not exist %s
\n
"
,
source
);
return
-
1
;
}
}
if
(
use_symlink
&&
!
symlink
(
source
,
dest
))
{
pull_say
(
"symlink %s
\n
"
,
hex
);
return
0
;
if
(
use_symlink
)
{
struct
stat
st
;
if
(
stat
(
source
,
&
st
))
{
if
(
!
warn_if_not_exists
&&
errno
==
ENOENT
)
return
-
1
;
fprintf
(
stderr
,
"cannot stat %s: %s
\n
"
,
source
,
strerror
(
errno
));
return
-
1
;
}
if
(
!
symlink
(
source
,
dest
))
{
pull_say
(
"symlink %s
\n
"
,
hex
);
return
0
;
}
}
if
(
use_filecopy
)
{
int
ifd
,
ofd
,
status
;
...
...
@@ -72,7 +87,11 @@ static int copy_file(const char *source, const char *dest, const char *hex)
void
*
map
;
ifd
=
open
(
source
,
O_RDONLY
);
if
(
ifd
<
0
||
fstat
(
ifd
,
&
st
)
<
0
)
{
close
(
ifd
);
int
err
=
errno
;
if
(
ifd
>=
0
)
close
(
ifd
);
if
(
!
warn_if_not_exists
&&
err
==
ENOENT
)
return
-
1
;
fprintf
(
stderr
,
"cannot open %s
\n
"
,
source
);
return
-
1
;
}
...
...
@@ -86,7 +105,8 @@ static int copy_file(const char *source, const char *dest, const char *hex)
status
=
((
ofd
<
0
)
||
(
write
(
ofd
,
map
,
st
.
st_size
)
!=
st
.
st_size
));
munmap
(
map
,
st
.
st_size
);
close
(
ofd
);
if
(
ofd
>=
0
)
close
(
ofd
);
if
(
status
)
fprintf
(
stderr
,
"cannot write %s
\n
"
,
dest
);
else
...
...
@@ -116,11 +136,11 @@ static int fetch_pack(const unsigned char *sha1)
sprintf
(
filename
,
"%s/objects/pack/pack-%s.pack"
,
path
,
sha1_to_hex
(
target
->
sha1
));
copy_file
(
filename
,
sha1_pack_name
(
target
->
sha1
),
sha1_to_hex
(
target
->
sha1
));
sha1_to_hex
(
target
->
sha1
)
,
1
);
sprintf
(
filename
,
"%s/objects/pack/pack-%s.idx"
,
path
,
sha1_to_hex
(
target
->
sha1
));
copy_file
(
filename
,
sha1_pack_index_name
(
target
->
sha1
),
sha1_to_hex
(
target
->
sha1
));
sha1_to_hex
(
target
->
sha1
)
,
1
);
install_packed_git
(
target
);
return
0
;
}
...
...
@@ -141,7 +161,7 @@ static int fetch_file(const unsigned char *sha1)
filename
[
object_name_start
+
1
]
=
hex
[
1
];
filename
[
object_name_start
+
2
]
=
'/'
;
strcpy
(
filename
+
object_name_start
+
3
,
hex
+
2
);
return
copy_file
(
filename
,
dest_filename
,
hex
);
return
copy_file
(
filename
,
dest_filename
,
hex
,
0
);
}
int
fetch
(
unsigned
char
*
sha1
)
...
...
rsh.c
浏览文件 @
348c4c66
...
...
@@ -53,6 +53,7 @@ static int add_to_string(char **ptrp, int *sizep, const char *str, int quote)
char
*
p
=
*
ptrp
;
int
size
=
*
sizep
;
int
oc
;
int
err
=
0
;
if
(
quote
)
{
oc
=
shell_quote
(
p
,
size
,
str
);
...
...
@@ -62,15 +63,14 @@ static int add_to_string(char **ptrp, int *sizep, const char *str, int quote)
}
if
(
oc
>=
size
)
{
p
[
size
-
1
]
=
'\0'
;
*
ptrp
+=
size
-
1
;
*
sizep
=
1
;
return
1
;
/* Overflow, string unusable */
err
=
1
;
oc
=
size
-
1
;
}
*
ptrp
+=
oc
;
**
ptrp
=
'\0'
;
*
sizep
-=
oc
;
return
0
;
return
err
;
}
int
setup_connection
(
int
*
fd_in
,
int
*
fd_out
,
const
char
*
remote_prog
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录