Skip to content

rebase with preserve dates opt #96

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
skarim wants to merge 1 commit into from
Draft

rebase with preserve dates opt #96

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ If a rebase conflict occurs, the operation pauses and prints the conflicted file
| `--continue` | Continue the rebase after resolving conflicts |
| `--abort` | Abort the rebase and restore all branches to their pre-rebase state |
| `--remote <name>` | Remote to fetch from (defaults to auto-detected remote) |
| `--committer-date-is-author-date` | Preserve commit dates as the same as author dates. Alias: `--preserve-dates` |

| Argument | Description |
|----------|-------------|
Expand All @@ -231,6 +232,9 @@ gh stack rebase --continue

# Abort rebase and restore everything
gh stack rebase --abort

# Rebase and preserve committer date as author date
gh stack rebase --committer-date-is-author-date
```

### `gh stack modify`
Expand Down
78 changes: 43 additions & 35 deletions cmd/rebase.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,24 @@ import (
)

type rebaseOptions struct {
branch string
downstack bool
upstack bool
cont bool
abort bool
remote string
branch string
downstack bool
upstack bool
cont bool
abort bool
remote string
committerDateIsAuthorDate bool
}

type rebaseState struct {
CurrentBranchIndex int `json:"currentBranchIndex"`
ConflictBranch string `json:"conflictBranch"`
RemainingBranches []string `json:"remainingBranches"`
OriginalBranch string `json:"originalBranch"`
OriginalRefs map[string]string `json:"originalRefs"`
UseOnto bool `json:"useOnto,omitempty"`
OntoOldBase string `json:"ontoOldBase,omitempty"`
CurrentBranchIndex int `json:"currentBranchIndex"`
ConflictBranch string `json:"conflictBranch"`
RemainingBranches []string `json:"remainingBranches"`
OriginalBranch string `json:"originalBranch"`
OriginalRefs map[string]string `json:"originalRefs"`
UseOnto bool `json:"useOnto,omitempty"`
OntoOldBase string `json:"ontoOldBase,omitempty"`
CommitterDateIsAuthorDate bool `json:"committerDateIsAuthorDate,omitempty"`
}

const rebaseStateFile = "gh-stack-rebase-state"
Expand Down Expand Up @@ -74,6 +76,8 @@ layer in its commit history, rebasing if necessary.`,
cmd.Flags().BoolVar(&opts.cont, "continue", false, "Continue rebase after resolving conflicts")
cmd.Flags().BoolVar(&opts.abort, "abort", false, "Abort rebase and restore all branches")
cmd.Flags().StringVar(&opts.remote, "remote", "", "Remote to fetch from (defaults to auto-detected remote)")
cmd.Flags().BoolVar(&opts.committerDateIsAuthorDate, "committer-date-is-author-date", false, "Preserve commit dates as the same as author dates")
cmd.Flags().BoolVar(&opts.committerDateIsAuthorDate, "preserve-dates", false, "Alias for --committer-date-is-author-date")

return cmd
}
Expand Down Expand Up @@ -184,26 +188,28 @@ func runRebase(cfg *config.Config, opts *rebaseOptions) error {
}

rebaseResult := cascadeRebase(cascadeRebaseOpts{
Cfg: cfg,
Stack: s,
Branches: branchesToRebase,
StartAbsIdx: startIdx,
OriginalRefs: originalRefs,
NeedsOnto: needsOnto,
OntoOldBase: ontoOldBase,
Cfg: cfg,
Stack: s,
Branches: branchesToRebase,
StartAbsIdx: startIdx,
OriginalRefs: originalRefs,
NeedsOnto: needsOnto,
OntoOldBase: ontoOldBase,
CommitterDateIsAuthorDate: opts.committerDateIsAuthorDate,
})

if rebaseResult.Conflicted {
cfg.Warningf("Rebasing %s onto %s — conflict", rebaseResult.ConflictBranch, rebaseResult.ConflictBase)

state := &rebaseState{
CurrentBranchIndex: rebaseResult.ConflictIdx,
ConflictBranch: rebaseResult.ConflictBranch,
RemainingBranches: rebaseResult.Remaining,
OriginalBranch: currentBranch,
OriginalRefs: originalRefs,
UseOnto: rebaseResult.NeedsOnto,
OntoOldBase: rebaseResult.OntoOldBase,
CurrentBranchIndex: rebaseResult.ConflictIdx,
ConflictBranch: rebaseResult.ConflictBranch,
RemainingBranches: rebaseResult.Remaining,
OriginalBranch: currentBranch,
OriginalRefs: originalRefs,
UseOnto: rebaseResult.NeedsOnto,
OntoOldBase: rebaseResult.OntoOldBase,
CommitterDateIsAuthorDate: opts.committerDateIsAuthorDate,
}
if err := saveRebaseState(gitDir, state); err != nil {
cfg.Warningf("failed to save rebase state: %s", err)
Expand Down Expand Up @@ -284,7 +290,8 @@ func continueRebase(cfg *config.Config, gitDir string) error {
conflictBranch, s.Branches[len(s.Branches)-1].Branch)

if git.IsRebaseInProgress() {
if err := git.RebaseContinue(); err != nil {
rebaseOpts := git.RebaseOpts{CommitterDateIsAuthorDate: state.CommitterDateIsAuthorDate}
if err := git.RebaseContinue(rebaseOpts); err != nil {
return fmt.Errorf("rebase continue failed — resolve remaining conflicts and try again: %w", err)
}
}
Expand Down Expand Up @@ -324,13 +331,14 @@ func continueRebase(cfg *config.Config, gitDir string) error {
}

result := cascadeRebase(cascadeRebaseOpts{
Cfg: cfg,
Stack: s,
Branches: remainingRefs,
StartAbsIdx: startAbsIdx,
OriginalRefs: state.OriginalRefs,
NeedsOnto: state.UseOnto,
OntoOldBase: state.OntoOldBase,
Cfg: cfg,
Stack: s,
Branches: remainingRefs,
StartAbsIdx: startAbsIdx,
OriginalRefs: state.OriginalRefs,
NeedsOnto: state.UseOnto,
OntoOldBase: state.OntoOldBase,
CommitterDateIsAuthorDate: state.CommitterDateIsAuthorDate,
})

if result.Conflicted {
Expand Down
Loading
Loading