Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
2d280e1c
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,发现更多精彩内容 >>
提交
2d280e1c
编写于
4月 29, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update the merge scripts for the big git rename.
Let's see what else I forgot..
上级
aed7a5a9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
18 deletion
+18
-18
git-merge-one-file-script
git-merge-one-file-script
+7
-7
git-pull-script
git-pull-script
+11
-11
未找到文件。
git-merge-one-file-script
浏览文件 @
2d280e1c
...
...
@@ -32,7 +32,7 @@ case "${1:-.}${2:-.}${3:-.}" in
"
$1
.."
|
"
$1
.
$1
"
|
"
$1$1
."
)
rm
-f
--
"
$4
"
echo
"Removing
$4
"
update-cache
--remove
--
"
$4
"
git-
update-cache
--remove
--
"
$4
"
exit
0
;;
...
...
@@ -43,7 +43,7 @@ case "${1:-.}${2:-.}${3:-.}" in
echo
"Adding
$4
with perm
$6$7
"
mv
$(
unpack-file
"
$2$3
"
)
$4
chmod
"
$6$7
"
$4
update-cache
--add
--
$4
git-
update-cache
--add
--
$4
exit
0
;;
#
...
...
@@ -57,16 +57,16 @@ case "${1:-.}${2:-.}${3:-.}" in
echo
"Adding
$4
with perm
$6
"
mv
$(
unpack-file
"
$2
"
)
$4
chmod
"
$6
"
$4
update-cache
--add
--
$4
git-
update-cache
--add
--
$4
exit
0
;;
#
# Modified in both, but differently ;(
#
"
$1$2$3
"
)
echo
"Auto-merging
$4
"
orig
=
$(
unpack-file
$1
)
src1
=
$(
unpack-file
$2
)
src2
=
$(
unpack-file
$3
)
orig
=
$(
git-
unpack-file
$1
)
src1
=
$(
git-
unpack-file
$2
)
src2
=
$(
git-
unpack-file
$3
)
merge
"
$src2
"
"
$orig
"
"
$src1
"
ret
=
$?
if
[
"
$6
"
!=
"
$7
"
]
;
then
...
...
@@ -81,7 +81,7 @@ case "${1:-.}${2:-.}${3:-.}" in
echo
"ERROR: Leaving conflict merge in
$src2
"
exit
1
fi
cp
--
"
$src2
"
"
$4
"
&&
chmod
--
"
$6
"
"
$4
"
&&
update-cache
--add
--
"
$4
"
&&
exit
0
cp
--
"
$src2
"
"
$4
"
&&
chmod
--
"
$6
"
"
$4
"
&&
git-
update-cache
--add
--
"
$4
"
&&
exit
0
;;
*
)
...
...
git-pull-script
浏览文件 @
2d280e1c
...
...
@@ -16,16 +16,16 @@ rsync -L $merge_repo/HEAD .git/MERGE_HEAD || exit 1
head
=
$(
cat
.git/HEAD
)
merge_head
=
$(
cat
.git/MERGE_HEAD
)
common
=
$(
merge-base
$head
$merge_head
)
common
=
$(
git-
merge-base
$head
$merge_head
)
if
[
-z
"
$common
"
]
;
then
echo
"Unable to find common commit between"
$merge_head
$head
exit
1
fi
# Get the trees associated with those commits
common_tree
=
$(
cat-file commit
$common
|
sed
's/tree //;q'
)
head_tree
=
$(
cat-file commit
$head
|
sed
's/tree //;q'
)
merge_tree
=
$(
cat-file commit
$merge_head
|
sed
's/tree //;q'
)
common_tree
=
$(
git-
cat-file commit
$common
|
sed
's/tree //;q'
)
head_tree
=
$(
git-
cat-file commit
$head
|
sed
's/tree //;q'
)
merge_tree
=
$(
git-
cat-file commit
$merge_head
|
sed
's/tree //;q'
)
if
[
"
$common
"
==
"
$merge_head
"
]
;
then
echo
"Already up-to-date. Yeeah!"
...
...
@@ -36,21 +36,21 @@ if [ "$common" == "$head" ]; then
echo
"Destroying all noncommitted data!"
echo
"Kill me within 3 seconds.."
sleep
3
read-tree
-m
$merge_tree
&&
checkout-cache
-f
-a
&&
update-cache
--refresh
git-read-tree
-m
$merge_tree
&&
git-checkout-cache
-f
-a
&&
git-
update-cache
--refresh
echo
$merge_head
>
.git/HEAD
exit
0
fi
echo
"Trying to merge
$merge_head
into
$head
"
read-tree
-m
$common_tree
$head_tree
$merge_tree
git-
read-tree
-m
$common_tree
$head_tree
$merge_tree
merge_msg
=
"Merge of
$merge_repo
"
result_tree
=
$(
write-tree 2> /dev/null
)
result_tree
=
$(
git-
write-tree 2> /dev/null
)
if
[
$?
-ne
0
]
;
then
echo
"Simple merge failed, trying Automatic merge"
merge-cache git-merge-one-file-script
-a
git-
merge-cache git-merge-one-file-script
-a
merge_msg
=
"Automatic merge of
$merge_repo
"
result_tree
=
$(
write-tree
)
||
exit
1
result_tree
=
$(
git-
write-tree
)
||
exit
1
fi
result_commit
=
$(
echo
"
$merge_msg
"
| commit-tree
$result_tree
-p
$head
-p
$merge_head
)
result_commit
=
$(
echo
"
$merge_msg
"
|
git-
commit-tree
$result_tree
-p
$head
-p
$merge_head
)
echo
"Committed merge
$result_commit
"
echo
$result_commit
>
.git/HEAD
checkout-cache
-f
-a
&&
update-cache
--refresh
git-checkout-cache
-f
-a
&&
git-
update-cache
--refresh
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录