threads / discuss / 29391

modifying the commits before push

Subject: modifying the commits before push

## tl;dr

4 messages between Jan 18, 2012 and Jan 18, 2012.

replies: 3people: 3as markdown or json

Sam Steingold· Jan 18, 2012, 17:49 UTC · lore

Hi, I am trying to push: $ git status # On branch master # Your branch is ahead of 'origin/master' by 4 commits. # nothing to commit (working directory clean) $ but `git push` fails with this:

remote: ERROR: Rejecting update because this commit email is not from ZZZ
What I need to do is
- modify the 4 commits with a different e-mail and do `git push` again
- make sure that all my commits in this repo are done with the correct e-mail
how do I do this?
thanks!
-- 
Sam Steingold (http://sds.podval.org/) on Ubuntu 11.10 (oneiric) X 11.0.11004000
http://pmw.org.il http://jihadwatch.org http://thereligionofpeace.com
http://openvotingconsortium.org http://ffii.org http://camera.org
Let us remember that ours is a nation of lawyers and order.
Dirk Süsserott· Jan 18, 2012, 20:18 UTC · re: Sam Steingold · lore

Re: modifying the commits before push

Am 18.01.2012 18:49 schrieb Sam Steingold:
Show 20 quoted lines
> Hi,
> I am trying to push:
> $ git status
> # On branch master
> # Your branch is ahead of 'origin/master' by 4 commits.
> #
> nothing to commit (working directory clean)
> $
> but `git push` fails with this:
> 
> remote: ERROR: Rejecting update because this commit email is not from ZZZ
> 
> What I need to do is
> - modify the 4 commits with a different e-mail and do `git push` again
> - make sure that all my commits in this repo are done with the correct e-mail
> 
> how do I do this?
> 
> thanks!
> 
Hi Sam,

to modify the last 4 commits you can use git filter-branch (see the manpage):

$ git checkout master
$ git filter-branch --env-filter \
   'GIT_COMMITTER_EMAIL="sds@gnu.org" \
    GIT_COMMITTER_NAME="Sam Steingold"' \
   HEAD~4..HEAD

It should tell you that it rewrites 4 commits. The original tree is saved under original/refs/heads/master. If sth. went wrong, reset your master to that point (easiest with gitk, it's steel blue). If it worked, you can delete the original/refs/heads/master like so:

$ git for-each-ref --format="%(refname)" \
    refs/original/ | xargs -n 1 git update-ref -d
Note: Whether it worked or not, remove the original refs afterwards,
because a second run of git filter-branch will fail if there's already
an "original" tree.

To change your address for future commits configure it in .gitconfig in your $HOME (--global) or on a per repo basis in .git/config (--local):

$ git config --global user.email "sds@gnu.org" $ git config --global user.name "Sam Steingold"

Or use git gui for this step (Edit -> Options).
HTH
    Dirk
Sam Steingold· Jan 18, 2012, 21:47 UTC · re: Dirk Süsserott · lore

Re: modifying the commits before push

Hi Dirk,
Show 13 quoted lines
> * Dirk Süsserott <arjfyrggre@qvex.zl1.pp> [2012-01-18 21:18:34 +0100]:
> Am 18.01.2012 18:49 schrieb Sam Steingold:
>
> to modify the last 4 commits you can use git filter-branch (see the
> manpage):
>
> $ git checkout master
> $ git filter-branch --env-filter \
>    'GIT_COMMITTER_EMAIL="sds@gnu.org" \
>     GIT_COMMITTER_NAME="Sam Steingold"' \
>    HEAD~4..HEAD
>
> It should tell you that it rewrites 4 commits.

I did this; I got a few messages which scrolled very quickly. status code was 0, apparently, I was successful.

> The original tree is saved under original/refs/heads/master.
where is that?
Show 10 quoted lines
> If sth. went wrong, reset your master to that point (easiest with
> gitk, it's steel blue). If it worked, you can delete the
> original/refs/heads/master like so:
>
> $ git for-each-ref --format="%(refname)" \
>     refs/original/ | xargs -n 1 git update-ref -d
>
> Note: Whether it worked or not, remove the original refs afterwards,
> because a second run of git filter-branch will fail if there's already
> an "original" tree.

alas, I could not push because the remote tree was modified in the meantime, I pulled and now:

# On branch master # Your branch is ahead of 'origin/master' by 23 commits. # nothing to commit (working directory clean)

so, what do I do now?

is there a way for me to get back my original 4 patches, reset my tree (maybe by rm-rf+clone) and then re-apply them?

thanks!
-- 
Sam Steingold (http://sds.podval.org/) on Ubuntu 11.10 (oneiric) X 11.0.11004000
http://jihadwatch.org http://memri.org http://thereligionofpeace.com
http://www.PetitionOnline.com/tap12009/ http://palestinefacts.org
I don't have an attitude problem. You have a perception problem.
Andreas Schwab· Jan 18, 2012, 22:01 UTC · re: Sam Steingold · lore

Re: modifying the commits before push

Sam Steingold <sds@gnu.org> writes:
Show 5 quoted lines
> alas, I could not push because the remote tree was modified in the
> meantime, I pulled and now:
>
> # On branch master
> # Your branch is ahead of 'origin/master' by 23 commits.
What exactly did you do to get the additional 19 commits?
> is there a way for me to get back my original 4 patches, reset my tree
> (maybe by rm-rf+clone) and then re-apply them?
You can find them in the reflog (git log -g).
Andreas.
-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

← back to recent threads