-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Simplified loop and changed to 1-based indexing (#597)
Simplified foreach loop in tribits_generate_single_repo_version_string and changed the parent indexing to be 1-based instead of 0-based.
- Loading branch information
Showing
4 changed files
with
15 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -128,12 +128,12 @@ tribits_add_advanced_test( TribitsHelloWorld_config_git_version_single_repo_two_ | |
PASS_REGULAR_EXPRESSION_ALL | ||
"a1234tgb .Thu Sep 21 19:19:18 2023 -0400. <[email protected]>" | ||
"This is the HEAD commit summary line" | ||
"Parent 0:" | ||
"b5678aop .Thu Sep 20 19:19:18 2023 -0400. <[email protected]>" | ||
"This is parent 0 commit summary line" | ||
"Parent 1:" | ||
"c9101hah .Thu Sep 19 19:19:18 2023 -0400. <[email protected]>" | ||
"b5678aop .Thu Sep 20 19:19:18 2023 -0400. <[email protected]>" | ||
"This is parent 1 commit summary line" | ||
"Parent 2:" | ||
"c9101hah .Thu Sep 19 19:19:18 2023 -0400. <[email protected]>" | ||
"This is parent 2 commit summary line" | ||
ALWAYS_FAIL_ON_NONZERO_RETURN | ||
|
||
TEST_4 | ||
|
8 changes: 4 additions & 4 deletions
8
...re_git_mockprogram_files/TribitsHelloWorldRepoVersion.single_repo_two_parents_version.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
*** Base Git Repo: TribitsHelloWorld | ||
a1234tgb [Thu Sep 21 19:19:18 2023 -0400] <[email protected]> | ||
This is the HEAD commit summary line | ||
*** Parent 0: | ||
b5678aop [Thu Sep 20 19:19:18 2023 -0400] <[email protected]> | ||
This is parent 0 commit summary line | ||
*** Parent 1: | ||
c9101hah [Thu Sep 19 19:19:18 2023 -0400] <[email protected]> | ||
b5678aop [Thu Sep 20 19:19:18 2023 -0400] <[email protected]> | ||
This is parent 1 commit summary line | ||
*** Parent 2: | ||
c9101hah [Thu Sep 19 19:19:18 2023 -0400] <[email protected]> | ||
This is parent 2 commit summary line |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,10 +12,10 @@ MOCK_PROGRAM_RETURN: 0 | |
MOCK_PROGRAM_OUTPUT: b5678aop [Thu Sep 20 19:19:18 2023 -0400] <[email protected]> | ||
MOCK_PROGRAM_INPUT: log -1 --pretty=format:%s b5678aop | ||
MOCK_PROGRAM_RETURN: 0 | ||
MOCK_PROGRAM_OUTPUT: This is parent 0 commit summary line | ||
MOCK_PROGRAM_OUTPUT: This is parent 1 commit summary line | ||
MOCK_PROGRAM_INPUT: log -1 --pretty=format:%h [%ad] <%ae> c9101hah | ||
MOCK_PROGRAM_RETURN: 0 | ||
MOCK_PROGRAM_OUTPUT: c9101hah [Thu Sep 19 19:19:18 2023 -0400] <[email protected]> | ||
MOCK_PROGRAM_INPUT: log -1 --pretty=format:%s c9101hah | ||
MOCK_PROGRAM_RETURN: 0 | ||
MOCK_PROGRAM_OUTPUT: This is parent 1 commit summary line | ||
MOCK_PROGRAM_OUTPUT: This is parent 2 commit summary line |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters