Gray out rebased commits in pull request commit list (OD-154)
Michael Weimann opened 6 years ago

Consider the following scenario:

  • PR opened
  • Discussion
  • Work on the code
  • Clean up by squashing / rebasing etc. (Git history changes)
  • Force push the branch

At the moment OneDev does show the historical commits as well.
An example here: https://onedev.io/projects/michael.test/pulls/1/activities

For me this is quite annoying. I cannot see the actual resulting commits of the Pull Request.

Suggestions:

  • Show the list of resulting commits in the "Merge Preview" view
  • Mark deleted commits in the "File Changes" view. E.g. by crossing them out

GitHub for example removes the commits from the PR activities but adds a note about a "push force". See here: https://github.com/nextcloud/bookmarks/pull/1081

  • Robin Shen commented 6 years ago

    OneDev intentionally lists squashed/rebased commits here for sake of displaying incremental changes. But adding some marks such as crossing out outdated commits is a good idea to tell them apart from effective commits.

    Thanks for the suggestion.

  • Robin Shen changed iterations 6 years ago
    Previous Value Current Value
    empty
    3.2.1
  • Robin Shen batch edited 6 years ago
    Name Previous Value Current Value
    Iterations
    3.2.1
    3.2.2
  • Robin Shen changed title 6 years ago
    Previous Value Current Value
    Git history changes and PRs
    Gray out rebased commits in pull request commit list
  • OneDev changed state to 'Closed' 6 years ago
    Previous Value Current Value
    Open
    Closed
  • OneDev changed state to 'Released' 6 years ago
    Previous Value Current Value
    Closed
    Released
issue 1/1
Type
Improvement
Priority
Normal
Assignee
Iterations
Issue Votes (0)
Watchers (3)
Reference
OD-154
Please wait...
Connection lost or session expired, reload to recover
Page is in error, reload to recover