Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change git checkout to be forced to discard local changes #8

Merged
merged 15 commits into from
Sep 26, 2023
Merged

Change git checkout to be forced to discard local changes #8

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
821adeb
Fix fetching submodules ignoring update rule set to none
juliangiebel Sep 8, 2023
7672337
Merge remote-tracking branch 'origin/development' into development
juliangiebel Sep 8, 2023
81a485f
Merge branch 'master' into development
juliangiebel Sep 20, 2023
75e1ab2
Replace libgit2sharp (#3)
juliangiebel Sep 20, 2023
4cfd5c1
Implement reverse proxy header and path base configuration options
juliangiebel Sep 21, 2023
e5e585a
Merge branch 'master' into development
juliangiebel Sep 21, 2023
b219824
Fix generated urls for maps not taking PathBase into account
juliangiebel Sep 21, 2023
e4b7a96
Merge branch 'master' into development
juliangiebel Sep 21, 2023
2427877
Merge branch 'master' into development
juliangiebel Sep 21, 2023
1c419be
Merge branch 'master' into development
juliangiebel Sep 24, 2023
8c16809
Fix github webook only setup
juliangiebel Sep 24, 2023
04ade12
Merge branch 'development' of github.com:juliangiebel/SS14.MapServer …
juliangiebel Sep 24, 2023
629e8e3
Bumb version number
juliangiebel Sep 24, 2023
62ce7f4
Change git checkout to be forced to discard local changes
juliangiebel Sep 25, 2023
a40dca2
Merge branch 'master' into development
juliangiebel Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SS14.MapServer/Services/GitService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private void Clone(string repoUrl, string directory, string gitRef)

RunCommand(Path.GetFullPath("./..", directory), "clone --recurse-submodules", sshConfig, repoUrl);
RunCommand(directory, "fetch -fu origin", gitRef);
RunCommand(directory, "checkout", StripRef(gitRef));
RunCommand(directory, "checkout --force", StripRef(gitRef));

_log.Information("Done cloning");
}
Expand All @@ -117,7 +117,7 @@ private void Pull(string repoDirectory, string gitRef)
RunCommand(repoDirectory, "fetch -fu origin", gitRef);

_log.Debug("Checking out {Ref}", StripRef(gitRef));
RunCommand(repoDirectory, "checkout", StripRef(gitRef));
RunCommand(repoDirectory, "checkout --force", StripRef(gitRef));

_log.Debug("Pulling latest changes");
RunCommand(repoDirectory, "pull origin HEAD --ff-only --force");
Expand Down