Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
49b27885
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,发现更多精彩内容 >>
提交
49b27885
编写于
7月 05, 2006
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'jc/diff-test'
* jc/diff-test: t4013: add "diff" UI program tests.
上级
0c926a3d
b319b02e
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
263 addition
and
0 deletion
+263
-0
t/t4013-diff-various.sh
t/t4013-diff-various.sh
+9
-0
t/t4013/diff.diff_--abbrev_initial..side
t/t4013/diff.diff_--abbrev_initial..side
+32
-0
t/t4013/diff.diff_--patch-with-raw_-r_initial..side
t/t4013/diff.diff_--patch-with-raw_-r_initial..side
+36
-0
t/t4013/diff.diff_--patch-with-raw_initial..side
t/t4013/diff.diff_--patch-with-raw_initial..side
+36
-0
t/t4013/diff.diff_--patch-with-stat_-r_initial..side
t/t4013/diff.diff_--patch-with-stat_-r_initial..side
+37
-0
t/t4013/diff.diff_--patch-with-stat_initial..side
t/t4013/diff.diff_--patch-with-stat_initial..side
+37
-0
t/t4013/diff.diff_--stat_initial..side
t/t4013/diff.diff_--stat_initial..side
+6
-0
t/t4013/diff.diff_-r_--stat_initial..side
t/t4013/diff.diff_-r_--stat_initial..side
+6
-0
t/t4013/diff.diff_-r_initial..side
t/t4013/diff.diff_-r_initial..side
+32
-0
t/t4013/diff.diff_initial..side
t/t4013/diff.diff_initial..side
+32
-0
未找到文件。
t/t4013-diff-various.sh
浏览文件 @
49b27885
...
...
@@ -233,6 +233,15 @@ format-patch --attach --stdout initial..side
format-patch --attach --stdout initial..master^
format-patch --attach --stdout initial..master
diff --abbrev initial..side
diff -r initial..side
diff --stat initial..side
diff -r --stat initial..side
diff initial..side
diff --patch-with-stat initial..side
diff --patch-with-raw initial..side
diff --patch-with-stat -r initial..side
diff --patch-with-raw -r initial..side
EOF
test_done
t/t4013/diff.diff_--abbrev_initial..side
0 → 100644
浏览文件 @
49b27885
$
git diff --abbrev initial..side
diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
--- a/dir/sub
+++ b/dir/sub
@@ -1,2 +1,4 @@
A
B
+1
+2
diff --git a/file0 b/file0
index 01e79c3..f4615da 100644
--- a/file0
+++ b/file0
@@ -1,3 +1,6 @@
1
2
3
+A
+B
+C
diff --git a/file3 b/file3
new file mode 100644
index 0000000..7289e35
--- /dev/null
+++ b/file3
@@ -0,0 +1,4 @@
+A
+B
+1
+2
$
t/t4013/diff.diff_--patch-with-raw_-r_initial..side
0 → 100644
浏览文件 @
49b27885
$
git diff --patch-with-raw -r initial..side
:100644
100644 35d242b... 7289e35... M dir/sub
:100644
100644 01e79c3... f4615da... M file0
:000000
100644 0000000... 7289e35... A file3
diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
--- a/dir/sub
+++ b/dir/sub
@@ -1,2 +1,4 @@
A
B
+1
+2
diff --git a/file0 b/file0
index 01e79c3..f4615da 100644
--- a/file0
+++ b/file0
@@ -1,3 +1,6 @@
1
2
3
+A
+B
+C
diff --git a/file3 b/file3
new file mode 100644
index 0000000..7289e35
--- /dev/null
+++ b/file3
@@ -0,0 +1,4 @@
+A
+B
+1
+2
$
t/t4013/diff.diff_--patch-with-raw_initial..side
0 → 100644
浏览文件 @
49b27885
$
git diff --patch-with-raw initial..side
:100644
100644 35d242b... 7289e35... M dir/sub
:100644
100644 01e79c3... f4615da... M file0
:000000
100644 0000000... 7289e35... A file3
diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
--- a/dir/sub
+++ b/dir/sub
@@ -1,2 +1,4 @@
A
B
+1
+2
diff --git a/file0 b/file0
index 01e79c3..f4615da 100644
--- a/file0
+++ b/file0
@@ -1,3 +1,6 @@
1
2
3
+A
+B
+C
diff --git a/file3 b/file3
new file mode 100644
index 0000000..7289e35
--- /dev/null
+++ b/file3
@@ -0,0 +1,4 @@
+A
+B
+1
+2
$
t/t4013/diff.diff_--patch-with-stat_-r_initial..side
0 → 100644
浏览文件 @
49b27885
$
git diff --patch-with-stat -r initial..side
dir/sub | 2 ++
file0 | 3 +++
file3 | 4 ++++
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
--- a/dir/sub
+++ b/dir/sub
@@ -1,2 +1,4 @@
A
B
+1
+2
diff --git a/file0 b/file0
index 01e79c3..f4615da 100644
--- a/file0
+++ b/file0
@@ -1,3 +1,6 @@
1
2
3
+A
+B
+C
diff --git a/file3 b/file3
new file mode 100644
index 0000000..7289e35
--- /dev/null
+++ b/file3
@@ -0,0 +1,4 @@
+A
+B
+1
+2
$
t/t4013/diff.diff_--patch-with-stat_initial..side
0 → 100644
浏览文件 @
49b27885
$
git diff --patch-with-stat initial..side
dir/sub | 2 ++
file0 | 3 +++
file3 | 4 ++++
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
--- a/dir/sub
+++ b/dir/sub
@@ -1,2 +1,4 @@
A
B
+1
+2
diff --git a/file0 b/file0
index 01e79c3..f4615da 100644
--- a/file0
+++ b/file0
@@ -1,3 +1,6 @@
1
2
3
+A
+B
+C
diff --git a/file3 b/file3
new file mode 100644
index 0000000..7289e35
--- /dev/null
+++ b/file3
@@ -0,0 +1,4 @@
+A
+B
+1
+2
$
t/t4013/diff.diff_--stat_initial..side
0 → 100644
浏览文件 @
49b27885
$ git diff --stat initial..side
dir/sub | 2 ++
file0 | 3 +++
file3 | 4 ++++
3 files changed, 9 insertions(+), 0 deletions(-)
$
t/t4013/diff.diff_-r_--stat_initial..side
0 → 100644
浏览文件 @
49b27885
$ git diff -r --stat initial..side
dir/sub | 2 ++
file0 | 3 +++
file3 | 4 ++++
3 files changed, 9 insertions(+), 0 deletions(-)
$
t/t4013/diff.diff_-r_initial..side
0 → 100644
浏览文件 @
49b27885
$
git diff -r initial..side
diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
--- a/dir/sub
+++ b/dir/sub
@@ -1,2 +1,4 @@
A
B
+1
+2
diff --git a/file0 b/file0
index 01e79c3..f4615da 100644
--- a/file0
+++ b/file0
@@ -1,3 +1,6 @@
1
2
3
+A
+B
+C
diff --git a/file3 b/file3
new file mode 100644
index 0000000..7289e35
--- /dev/null
+++ b/file3
@@ -0,0 +1,4 @@
+A
+B
+1
+2
$
t/t4013/diff.diff_initial..side
0 → 100644
浏览文件 @
49b27885
$
git diff initial..side
diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
--- a/dir/sub
+++ b/dir/sub
@@ -1,2 +1,4 @@
A
B
+1
+2
diff --git a/file0 b/file0
index 01e79c3..f4615da 100644
--- a/file0
+++ b/file0
@@ -1,3 +1,6 @@
1
2
3
+A
+B
+C
diff --git a/file3 b/file3
new file mode 100644
index 0000000..7289e35
--- /dev/null
+++ b/file3
@@ -0,0 +1,4 @@
+A
+B
+1
+2
$
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录