Skip to main content

Browse the archive

Staging
v0.5.2
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 294c695d8cfbcf95a5c33fc6ba386f496964defb authored by Amos Waterland on 14 December 2005, 22:48:19 UTC, committed by Junio C Hamano on 15 December 2005, 01:04:47 UTC 
git rebase loses author name/email if given bad email address
 
If GIT_AUTHOR_EMAIL is of a certain form, `git rebase master' will blow
away the author name and email when fast-forward merging commits.  I
have not tracked it down, but here is a testcase that demonstrates the
behavior.

Signed-off-by: Amos Waterland <apw@us.ibm.com>
Acked-by: Michal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 32d9954
Raw File
Tip revision: 294c695d8cfbcf95a5c33fc6ba386f496964defb authored by Amos Waterland on 14 December 2005, 22:48:19 UTC
git rebase loses author name/email if given bad email address
Tip revision: 294c695
git-merge-ours.sh 
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Pretend we resolved the heads, but declare our tree trumps everybody else.
#

# We need to exit with 2 if the index does not match our HEAD tree,
# because the current index is what we will be committing as the
# merge result.

test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2

exit 0
back to top