Skip to content

Fix git status' display of git rebase -ir's label commands #2185

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.

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
merged 1 commit into from
May 10, 2019

Conversation

dscho
Copy link
Member

@dscho dscho commented May 10, 2019

Those label commands are currently displayed with their argument resolved as abbreviated commit hash. Not really what we want. We really want the label names instead.

Companion PR to gitgitgadget#188.

The argument of a `label` command does *not* want to be turned into an
abbreviated SHA-1.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho merged commit e3538d8 into git-for-windows:master May 10, 2019
@dscho dscho added this to the v2.21.0(2) milestone May 10, 2019
dscho added a commit to git-for-windows/build-extra that referenced this pull request May 10, 2019
During a run of `git rebase --rebase-merges`,
the output of `git status` [now shows `label` lines
correctly](git-for-windows/git#2185), i.e. with
the labels' names instead of the commit hash they point to.

Signed-off-by: Johannes Schindelin <[email protected]>
git-for-windows-ci pushed a commit that referenced this pull request May 10, 2019
Fix `git status`' display of `git rebase -ir`'s `label` commands
git-for-windows-ci pushed a commit that referenced this pull request May 10, 2019
Fix `git status`' display of `git rebase -ir`'s `label` commands
git-for-windows-ci pushed a commit that referenced this pull request May 10, 2019
Fix `git status`' display of `git rebase -ir`'s `label` commands
dscho added a commit that referenced this pull request May 13, 2019
Fix `git status`' display of `git rebase -ir`'s `label` commands
dscho added a commit that referenced this pull request May 13, 2019
Fix `git status`' display of `git rebase -ir`'s `label` commands
dscho added a commit to dscho/git that referenced this pull request May 13, 2019
…base-ir

Fix `git status`' display of `git rebase -ir`'s `label` commands
dscho added a commit to dscho/git that referenced this pull request May 13, 2019
…base-ir

Fix `git status`' display of `git rebase -ir`'s `label` commands
git-for-windows-ci pushed a commit that referenced this pull request May 14, 2019
Fix `git status`' display of `git rebase -ir`'s `label` commands
dscho added a commit that referenced this pull request May 14, 2019
Fix `git status`' display of `git rebase -ir`'s `label` commands
dscho added a commit that referenced this pull request May 14, 2019
Fix `git status`' display of `git rebase -ir`'s `label` commands
@dscho dscho deleted the fix-status-with-rebase-ir branch May 20, 2019 10:26
dscho added a commit that referenced this pull request May 21, 2019
Fix `git status`' display of `git rebase -ir`'s `label` commands
dscho added a commit that referenced this pull request May 22, 2019
Fix `git status`' display of `git rebase -ir`'s `label` commands
dscho added a commit that referenced this pull request May 25, 2019
Fix `git status`' display of `git rebase -ir`'s `label` commands
dscho added a commit that referenced this pull request Jun 4, 2019
Fix `git status`' display of `git rebase -ir`'s `label` commands
dscho added a commit that referenced this pull request Jun 8, 2019
Fix `git status`' display of `git rebase -ir`'s `label` commands
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant