This repository has been archived by the owner on Apr 27, 2023. It is now read-only.
Reset the repository before rebasing it. #69
Merged
Conversation
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
…es and prevent the repository not to be updated
| @@ -7,6 +7,7 @@ import com.softwaremill.codebrag.repository.config.{RepoData, UserPassCredential | |||
|
|
|||
| class GitSvnRepository(val repoData: RepoData) extends Repository with RepositoryAutoBuilder with GitSvnBranchesModel { | |||
|
|
|||
| private val CommandBaseReset = "git reset --hard" | |||
There was a problem hiding this comment.
Shouldn't it be git svn reset --hard? This classes handles SVN repos vi Git
There was a problem hiding this comment.
Indeed, I tried it but it wasn't working so I ended up this way. I thought it wasn't really problematic since it is a 'restore' command for the repo. What do you think?
There was a problem hiding this comment.
Tested locally and looks good
lukaszlenart
added a commit
that referenced
this pull request
Mar 15, 2016
Reset the repository before rebasing it.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When the repository has been modified (even if it shouldn't), simply doing a
git rebase --quietwon't update the repository and a message of typemy.file : needs updateis generated by the command. The codebrag's UI will no more display new commits because the repository is not updated.Adding a
git reset --hardbefore the rebase ensure all changes are erased and the repository is clean again and the UI reflects the new changes again.