Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
c10d6345
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,发现更多精彩内容 >>
提交
c10d6345
编写于
12月 22, 2005
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge in fixes up to 1.0.3 maintenance branch.
Signed-off-by:
N
Junio C Hamano
<
junkio@cox.net
>
上级
e6c310fd
c63da8d8
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
50 addition
and
20 deletion
+50
-20
Makefile
Makefile
+3
-0
debian/changelog
debian/changelog
+23
-0
http-fetch.c
http-fetch.c
+8
-4
send-pack.c
send-pack.c
+14
-16
sha1_file.c
sha1_file.c
+2
-0
未找到文件。
Makefile
浏览文件 @
c10d6345
...
...
@@ -397,6 +397,9 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
git-cherry-pick
:
git-revert
cp
$<
$@
# format-patch records GIT_VERSION
git-format-patch
:
Makefile
%.o
:
%.c
$(CC)
-o
$*
.o
-c
$(ALL_CFLAGS)
$<
%.o
:
%.S
...
...
debian/changelog
浏览文件 @
c10d6345
...
...
@@ -10,6 +10,29 @@ git-core (1.0.0.GIT-0) unstable; urgency=low
-- Junio C Hamano <junkio@cox.net> Wed, 21 Dec 2005 12:12:05 -0800
git-core (1.0.3-0) unstable; urgency=low
* GIT 1.0.3 maintenance release.
-- Junio C Hamano <junkio@cox.net> Thu, 22 Dec 2005 18:13:33 -0800
git-core (1.0.0b-0) unstable; urgency=low
* GIT 1.0.0b to include two more fixes.
-- Junio C Hamano <junkio@cox.net> Wed, 21 Dec 2005 13:50:21 -0800
git-core (1.0.0a-0) unstable; urgency=low
* GIT 1.0.0a to include the following fixes:
- Avoid misleading success message on error (Johannes)
- objects/info/packs: work around bug in http-fetch.c::fetch_indices()
- http-fetch.c: fix objects/info/pack parsing.
- An off-by-one bug found by valgrind (Pavel)
-- Junio C Hamano <junkio@cox.net> Wed, 21 Dec 2005 13:17:17 -0800
git-core (1.0.0-0) unstable; urgency=low
* GIT 1.0.0
...
...
http-fetch.c
浏览文件 @
c10d6345
...
...
@@ -267,7 +267,8 @@ static void process_object_response(void *callback_data)
obj_req
->
state
=
COMPLETE
;
/* Use alternates if necessary */
if
(
obj_req
->
http_code
==
404
)
{
if
(
obj_req
->
http_code
==
404
||
obj_req
->
curl_result
==
CURLE_FILE_COULDNT_READ_FILE
)
{
fetch_alternates
(
alt
->
base
);
if
(
obj_req
->
repo
->
next
!=
NULL
)
{
obj_req
->
repo
=
...
...
@@ -475,7 +476,8 @@ static void process_alternates_response(void *callback_data)
}
}
}
else
if
(
slot
->
curl_result
!=
CURLE_OK
)
{
if
(
slot
->
http_code
!=
404
)
{
if
(
slot
->
http_code
!=
404
&&
slot
->
curl_result
!=
CURLE_FILE_COULDNT_READ_FILE
)
{
got_alternates
=
-
1
;
return
;
}
...
...
@@ -637,7 +639,8 @@ static int fetch_indices(struct alt_base *repo)
if
(
start_active_slot
(
slot
))
{
run_active_slot
(
slot
);
if
(
slot
->
curl_result
!=
CURLE_OK
)
{
if
(
slot
->
http_code
==
404
)
{
if
(
slot
->
http_code
==
404
||
slot
->
curl_result
==
CURLE_FILE_COULDNT_READ_FILE
)
{
repo
->
got_indices
=
1
;
free
(
buffer
.
buffer
);
return
0
;
...
...
@@ -802,7 +805,8 @@ static int fetch_object(struct alt_base *repo, unsigned char *sha1)
ret
=
error
(
"Request for %s aborted"
,
hex
);
}
else
if
(
obj_req
->
curl_result
!=
CURLE_OK
&&
obj_req
->
http_code
!=
416
)
{
if
(
obj_req
->
http_code
==
404
)
if
(
obj_req
->
http_code
==
404
||
obj_req
->
curl_result
==
CURLE_FILE_COULDNT_READ_FILE
)
ret
=
-
1
;
/* Be silent, it is probably in a pack. */
else
ret
=
error
(
"%s (curl_result = %d, http_code = %ld, sha1 = %s)"
,
...
...
send-pack.c
浏览文件 @
c10d6345
...
...
@@ -231,23 +231,21 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
if
(
!
force_update
&&
!
is_zero_sha1
(
ref
->
old_sha1
)
&&
!
ref
->
force
)
{
if
(
!
has_sha1_file
(
ref
->
old_sha1
))
{
error
(
"remote '%s' object %s does not "
"exist on local"
,
ref
->
name
,
sha1_to_hex
(
ref
->
old_sha1
));
ret
=
-
2
;
continue
;
}
/* We assume that local is fsck-clean. Otherwise
* you _could_ have an old tag which points at
* something you do not have, which may or may not
* be a commit.
*/
if
(
!
ref_newer
(
ref
->
peer_ref
->
new_sha1
,
if
(
!
has_sha1_file
(
ref
->
old_sha1
)
||
!
ref_newer
(
ref
->
peer_ref
->
new_sha1
,
ref
->
old_sha1
))
{
error
(
"remote ref '%s' is not a strict "
"subset of local ref '%s'."
,
ref
->
name
,
/* We do not have the remote ref, or
* we know that the remote ref is not
* an ancestor of what we are trying to
* push. Either way this can be losing
* commits at the remote end and likely
* we were not up to date to begin with.
*/
error
(
"remote '%s' is not a strict "
"subset of local ref '%s'. "
"maybe you are not up-to-date and "
"need to pull first?"
,
ref
->
name
,
ref
->
peer_ref
->
name
);
ret
=
-
2
;
continue
;
...
...
sha1_file.c
浏览文件 @
c10d6345
...
...
@@ -81,6 +81,8 @@ char * sha1_to_hex(const unsigned char *sha1)
*
buf
++
=
hex
[
val
>>
4
];
*
buf
++
=
hex
[
val
&
0xf
];
}
*
buf
=
'\0'
;
return
buffer
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录