Skip to content

fix: git pull resulted in a sync commit leading to lost changes #41467

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

Merged
sondermanish merged 1 commit into from
Dec 16, 2025
Merged

fix: git pull resulted in a sync commit leading to lost changes #41467

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 22 additions & 23 deletions ...ppsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1988,30 +1988,29 @@ private Mono<GitPullDTO> pullAndRehydrateArtifact(
importedBranchedArtifact
.getGitArtifactMetadata()
.getIsRepoPrivate()))
.flatMap(importedArtifact ->
gitArtifactHelper.getArtifactById(importedArtifact.getId(), null))
.flatMap(importedBranchedArtifact -> {
return gitArtifactHelper
.publishArtifact(importedBranchedArtifact, false)
.then(getGitUserForArtifactId(baseArtifactId))
.flatMap(gitAuthor -> {
CommitDTO commitDTO = new CommitDTO();
commitDTO.setMessage(DEFAULT_COMMIT_MESSAGE
+ GitDefaultCommitMessage.SYNC_WITH_REMOTE_AFTER_PULL.getReason());
commitDTO.setAuthor(gitAuthor);

GitPullDTO gitPullDTO = new GitPullDTO();
gitPullDTO.setMergeStatus(status);
gitPullDTO.setArtifact(importedBranchedArtifact);

return Mono.defer(() -> commitArtifact(
commitDTO,
baseArtifact,
importedBranchedArtifact,
gitType,
false))
.thenReturn(gitPullDTO);
});
return gitArtifactHelper.publishArtifact(importedBranchedArtifact, false);
})
.flatMap(publishedArtifact -> {
return getGitUserForArtifactId(baseArtifactId).flatMap(gitAuthor -> {
CommitDTO commitDTO = new CommitDTO();
commitDTO.setMessage(DEFAULT_COMMIT_MESSAGE
+ GitDefaultCommitMessage.SYNC_WITH_REMOTE_AFTER_PULL.getReason());
commitDTO.setAuthor(gitAuthor);

GitPullDTO gitPullDTO = new GitPullDTO();
gitPullDTO.setMergeStatus(status);
gitPullDTO.setArtifact(publishedArtifact);

// TODO: this can be done async as well.
return Mono.defer(() -> commitArtifact(
commitDTO,
publishedArtifact.getId(),
publishedArtifact.getArtifactType(),
gitType,
false))
.thenReturn(gitPullDTO);
});
});
});
}
Expand Down