Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Caenslowcontrol Json
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
gamma
Caenslowcontrol Json
Commits
cd3b47ce
Commit
cd3b47ce
authored
2 years ago
by
Alain Goasduff
Browse files
Options
Downloads
Patches
Plain Diff
now compatible with old git version, at least 1.8.3.1
parent
e93fb825
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
local.cxx
+5
-5
5 additions, 5 deletions
local.cxx
with
5 additions
and
5 deletions
local.cxx
+
5
−
5
View file @
cd3b47ce
...
...
@@ -98,9 +98,9 @@ void processGit(string filename)
string
newfile
=
nf
;
newfile
=
oldname
+
newfile
+
"__"
+
GetMachineID
()
+
".json"
;
//we must pull the submodule first to ensure all is up to date
if
(
system
(
"git -
C
./caenslowcontrol_json pull > gitlog.txt"
)
!=
0
)
if
(
system
(
"git -
-git-dir=
./caenslowcontrol_json
/.git
pull > gitlog.txt"
)
!=
0
)
{
ShowError
(
"git -
C
./caenslowcontrol_json pull > gitlog.txt"
);
ShowError
(
"git -
-git-dir=
./caenslowcontrol_json
/.git
pull > gitlog.txt"
);
return
;
}
sleep
(
1
);
...
...
@@ -121,7 +121,7 @@ void processGit(string filename)
//git add
path
=
PROJECT_NAME
;
cmd
=
"git -
C
./caenslowcontrol_json add "
+
path
+
"/"
+
newfile
+
" >> gitlog.txt"
;
cmd
=
"git -
-git-dir=
./caenslowcontrol_json
/.git
add "
+
path
+
"/"
+
newfile
+
" >> gitlog.txt"
;
if
(
system
(
cmd
.
c_str
())
!=
0
)
{
ShowError
(
cmd
);
...
...
@@ -131,7 +131,7 @@ void processGit(string filename)
//git commit
string
commit
=
"
\"
autopush of "
+
newfile
+
"
\"
"
;
cmd
=
"git -
C
./caenslowcontrol_json commit -m "
+
commit
+
" >> gitlog.txt"
;
cmd
=
"git -
-git-dir=
./caenslowcontrol_json
/.git
commit -m "
+
commit
+
" >> gitlog.txt"
;
if
(
system
(
cmd
.
c_str
())
!=
0
)
{
ShowError
(
cmd
);
...
...
@@ -139,7 +139,7 @@ void processGit(string filename)
}
//git push
cmd
=
"git -
C
./caenslowcontrol_json push >> gitlog.txt"
;
cmd
=
"git -
-git-dir=
./caenslowcontrol_json
/.git
push >> gitlog.txt"
;
if
(
system
(
cmd
.
c_str
())
!=
0
)
{
ShowError
(
cmd
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment