git-gui: Do not reset author details on amend #726
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I opened PRs also on patthoyts/git-gui#2 and on git#222 I'd like to see it in the upcoming release of Git for Windows, and I have no idea how much time it will take to accept it there, and until it propagates here... |
|
Very nice. Could you please add your Sign off? |
git commit --amend preserves the author details unless --reset-author is given. git-gui discards the author details on amend. Fix by reading the author details along with the commit message, and setting the appropriate environment variables required for preserving them. Reported long ago in the mailing list[1]. [1] http://article.gmane.org/gmane.comp.version-control.git/243921 Signed-off-by: Orgad Shaneh <[email protected]>
orgads
force-pushed
the
git-gui-preserve-author-windows
branch
from
2fe7cae to
41a5583
Compare
|
Done (for all the PRs). Thanks. |
|
Excellent, thanks! |
dscho
added a commit
to git-for-windows/build-extra
that referenced
this pull request
Apr 14, 2016
Git GUI [now sets author information correctly when amending](git-for-windows/git#726). Signed-off-by: Johannes Schindelin <[email protected]>
dscho
added a commit
that referenced
this pull request
Apr 30, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
May 20, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jun 7, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jun 9, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jun 9, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jun 9, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jun 9, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jun 14, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jul 12, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jul 16, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jul 23, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jul 23, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jul 23, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jul 27, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jul 27, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Jul 29, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Aug 2, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Aug 2, 2016
git-gui: Do not reset author details on amend
dscho
pushed a commit
that referenced
this pull request
Aug 2, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Sep 24, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Sep 24, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Sep 26, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Oct 3, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Oct 4, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Oct 5, 2016
git-gui: Do not reset author details on amend
dscho
pushed a commit
that referenced
this pull request
Oct 5, 2016
git-gui: Do not reset author details on amend
dscho
pushed a commit
that referenced
this pull request
Oct 7, 2016
git-gui: Do not reset author details on amend
dscho
pushed a commit
that referenced
this pull request
Oct 7, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Oct 9, 2016
git-gui: Do not reset author details on amend
dscho
pushed a commit
that referenced
this pull request
Oct 12, 2016
git-gui: Do not reset author details on amend
dscho
pushed a commit
that referenced
this pull request
Oct 12, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Oct 13, 2016
git-gui: Do not reset author details on amend
dscho
pushed a commit
that referenced
this pull request
Oct 13, 2016
git-gui: Do not reset author details on amend
dscho
pushed a commit
that referenced
this pull request
Oct 13, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Oct 15, 2016
git-gui: Do not reset author details on amend
dscho
pushed a commit
that referenced
this pull request
Oct 18, 2016
git-gui: Do not reset author details on amend
dscho
pushed a commit
that referenced
this pull request
Oct 18, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Oct 18, 2016
git-gui: Do not reset author details on amend
dscho
pushed a commit
that referenced
this pull request
Oct 20, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Oct 26, 2016
git-gui: Do not reset author details on amend
dscho
added a commit
that referenced
this pull request
Oct 29, 2016
git-gui: Do not reset author details on amend
dscho
pushed a commit
that referenced
this pull request
Nov 9, 2016
git-gui: Do not reset author details on amend
benpeart
pushed a commit
that referenced
this pull request
Jan 18, 2018
Merge v2.10.1.windows.1 This merges in tons of changes, and the diff is rather uninformative, reflecting mostly the changes between v2.10.0.windows.1 and v2.10.1.windows.1. Please note that this is a follow-up PR to https://mseng.visualstudio.com/VSOnline/_git/GitForWindows/pullrequest/148586?_a=overview, as I really wanted to make sure that everything compiles and tests just fine in Git for Windows' SDK. As with that PR, I queued a build&test: https://mseng.visualstudio.com/VSOnline/_build/index?buildId=3328228&_a=summary I carefully reviewed the "diff between diffs": I first generated a diff between `v2.10.0.windows.1` and `users/johasc/gvfs-gcc`, then a diff between `v2.10.1.windows.1` and this branch (`users/johasc/gvfs-2.10.1`), and finally I asked Git to render the differences between both, by using the `--no-index` option on the two `.diff` files. This "diff between diffs" reveals no differences except the expected ones: where the preimage changed. (I tried to paste that "diff of diffs" here, but I hit the limit for PR messages... :-)) Related work items: #726
benpeart
pushed a commit
that referenced
this pull request
Jan 18, 2018
This synchronizes GVFS' master with Git for Windows v2.10.1(2). - sequencer: future-proof remove_sequencer_state() - sequencer: allow the sequencer to take custody of malloc()ed data - sequencer: release memory that was allocated when reading options - sequencer: future-proof read_populate_todo() - sequencer: completely revamp the "todo" script parsing - sequencer: avoid completely different messages for different actions - sequencer: get rid of the subcommand field - sequencer: refactor the code to obtain a short commit name - sequencer: remember the onelines when parsing the todo file - sequencer: prepare for rebase -i's commit functionality ... Related work items: #726
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
git commit --amend preserves the author details unless --reset-author is
given.
git-gui discards the author details on amend.
Fix by reading the author details along with the commit message, and
setting the appropriate environment variables required for preserving
them.
Reported long ago in the mailing list[1].
[1] http://article.gmane.org/gmane.comp.version-control.git/243921