Skip to content

Add completion time and commit hash display to dev ps and mergeto commands #54

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

Draft
Copilot wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Add completion time and commit hash display to dev ps and mergeto commands #54

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b7c1c9
Initial plan
Copilot Aug 12, 2025
9114b43
Add completion time and commit hash display to dev ps and mergeto com…
Copilot Aug 12, 2025
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
13 changes: 13 additions & 0 deletions packages/dev/src/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,13 @@ export class GitPlugin extends BasePlugin {
spin.start();
await exec(`git push ${this.gitInfo.remoteName} ${this.gitInfo.currenBranch}`);
spin.stop();

// Get current commit info after push
await this.getCurrentGitInfo();
const completionTime = time();
console.log('Push success');
console.log(`Completion time: ${completionTime}`);
console.log(`Commit hash: ${this.gitInfo.lastCommitId}`);
}

async handleStatusDo() {
Expand Down Expand Up @@ -647,6 +653,13 @@ export class GitPlugin extends BasePlugin {

await exec(`git checkout ${currentBranch}`);
console.log('4. Switch back to the original branch:', currentBranch);

// Get current commit info after merge operation
await this.getCurrentGitInfo();
const completionTime = time();
console.log(`Merge operation completed`);
console.log(`Completion time: ${completionTime}`);
console.log(`Commit hash: ${this.gitInfo.lastCommitId}`);
} catch (error) {
console.error('Merge conflict detected. Please resolve the conflicts and commit the changes.');
}
Expand Down