Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
b76b5d34
Commit
b76b5d34
authored
Mar 31, 2014
by
Russell Belfer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve test of submodule name sorting
parent
7dcd42a5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
tests/diff/submodules.c
+6
-0
No files found.
tests/diff/submodules.c
View file @
b76b5d34
...
...
@@ -182,6 +182,8 @@ void test_diff_submodules__submod2_index_to_wd(void)
"<UNTRACKED>"
,
/* not */
"diff --git a/sm_changed_file b/sm_changed_file
\n
index 4800958..4800958 160000
\n
--- a/sm_changed_file
\n
+++ b/sm_changed_file
\n
@@ -1 +1 @@
\n
-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0
\n
+Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0-dirty
\n
"
,
/* sm_changed_file */
"diff --git a/sm_changed_head b/sm_changed_head
\n
index 4800958..3d9386c 160000
\n
--- a/sm_changed_head
\n
+++ b/sm_changed_head
\n
@@ -1 +1 @@
\n
-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0
\n
+Subproject commit 3d9386c507f6b093471a3e324085657a3c2b4247
\n
"
,
/* sm_changed_head */
"<UNTRACKED>"
,
/* sm_changed_head- */
"<UNTRACKED>"
,
/* sm_changed_head_ */
"diff --git a/sm_changed_index b/sm_changed_index
\n
index 4800958..4800958 160000
\n
--- a/sm_changed_index
\n
+++ b/sm_changed_index
\n
@@ -1 +1 @@
\n
-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0
\n
+Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0-dirty
\n
"
,
/* sm_changed_index */
"diff --git a/sm_changed_untracked_file b/sm_changed_untracked_file
\n
index 4800958..4800958 160000
\n
--- a/sm_changed_untracked_file
\n
+++ b/sm_changed_untracked_file
\n
@@ -1 +1 @@
\n
-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0
\n
+Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0-dirty
\n
"
,
/* sm_changed_untracked_file */
"diff --git a/sm_missing_commits b/sm_missing_commits
\n
index 4800958..5e49635 160000
\n
--- a/sm_missing_commits
\n
+++ b/sm_missing_commits
\n
@@ -1 +1 @@
\n
-Subproject commit 480095882d281ed676fe5b863569520e54a7d5c0
\n
+Subproject commit 5e4963595a9774b90524d35a807169049de8ccad
\n
"
,
/* sm_missing_commits */
...
...
@@ -190,6 +192,10 @@ void test_diff_submodules__submod2_index_to_wd(void)
g_repo
=
setup_fixture_submod2
();
/* bracket existing submodule with similarly named items */
cl_git_mkfile
(
"submod2/sm_changed_head-"
,
"hello"
);
cl_git_mkfile
(
"submod2/sm_changed_head_"
,
"hello"
);
opts
.
flags
=
GIT_DIFF_INCLUDE_UNTRACKED
;
opts
.
old_prefix
=
"a"
;
opts
.
new_prefix
=
"b"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment