albfan / git-changemail Goto Github PK

View Code? Open in Web Editor NEW

18.0 4.0 4.0 23 KB

License: GNU General Public License v3.0

Makefile 21.32% Shell 13.21% M4 65.47%

git-changemail's Introduction

git-changemail

Replace an user from the repo.

Background

I've had so many headaches about authors and committers, that finally I managed to built this script.

read this for real stories about people collaborating on git.

Installation

Download and symlink to your path

$ git clone https://github.com/albfan/git-changemail 
$ cd git-changemail
$ ln -s $PWD/git-changemail ~/bin/

Alternatively you can install system wide:

./autogen.sh --prefix /usr
make
sudo make install

Usage

git changemail or git changemail -h must show you how to use it

Examples

Change author matchings on current branch

$ git changemail -a [email protected] -n newname -m [email protected]

Change author and committer matchings on <branch> and <branch2>. Pass -f to filter-branch to allow rewriting backups

$ git changemail -b [email protected] -n newname -m [email protected] -- -f <branch> <branch2>

Show existing users on repo

$ git changemail --show-both

Tips

Consider to use git-backup-clean as git-change-mail uses filter-branch to operate and that lefts a backup on refs/original/refs/heads/master
if everything goes wrong issue:

$ git reset --hard refs/original/refs/heads/master

Also remember git reflog is your friend

git-changemail's People

Contributors

Stargazers

Watchers

Forkers

netors flobee habd0u csalam07

git-changemail's Issues

You can not specify a name with spaces on the -n parameter

If you specify a name with a space, you get an unexpected behavior:

git-changemail -b [email protected] -m "[email protected]" -n "Name Lastname" --dry-run -- -f *
[email protected] will be matched to replace:
   name: Name
   mail: Lastname

integer expression expected

Lines 11 and 15 cause "integer expression expected".

Add license information

Hello!

I found this script from https://stackoverflow.com/a/27754778/5287257

Could you please add information about a license of this repository — is it allowed to copy, change and use the code in any purpose?
It would be great to see any popular open source license.

avoid boilerplate parameters

If you don't want to change email/name you shouldn't have to supply it with -m/-n option

Add an --all option

As examples shows:

$ git changemail -b [email protected] -n newname -m [email protected] -- -f <branch> <branch2>

to affect more than one branch at time a complex trick must be typed. That's far from final user expectation.

add --all option to rewrite all
allow unknow parameters to be interpret as branches to rewrite
Manage backup cleanings between operations (mimic by now with --force or -f)

add install and help files

reproduce work done in:

to ease installation and show help with git changemail --help

You can not specify a name with spaces on the -n parameter, take 2

This is issue #1, take 2:

> git changemail -b [email protected] -m [email protected] -n 'Peter Valdemar Mørch' .
fatal: ambiguous argument 'Valdemar': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

The problem is in these lines in the script:

if [ "'$OLD_AUTHOR_EMAIL'" != "" ] && [ "$GIT_AUTHOR_EMAIL" = "'$OLD_AUTHOR_EMAIL'" ]
then
    an="'$NEW_AUTHOR_NAME'"
    am="'$NEW_AUTHOR_EMAIL'"
fi

Since $NEW_AUTHOR_NAME does contain spaces, the '$VAR' trick to put the contents of $VAR into the script argument to git filter-branch isn't going to work. Sorry, I don't have a better idea, but this is buggy. #1 only changed the parameters to show_change, but didn't actually fix the problem as far as I can see.

avoid git-changemail to run without options

Actually

$ git changemail

rewrites repo changing nothing at all. Detect and prevent it to happen (or show help)