summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-22 16:14:58 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-25 18:55:49 -0800
commit3f01ad665493e09aa816d84a872d9874f33a8c16 (patch)
tree6013b63d19bdb3b7626ff76f1ca0f4e330d9b5c2 /git-am.sh
parent5dc1308562ab5991ecada68b06707709bea408c9 (diff)
downloadgit-3f01ad665493e09aa816d84a872d9874f33a8c16.tar.gz
am: Add --committer-date-is-author-date option
This new option tells 'git-am' to use the timestamp recorded in the Email message as both author and committer date. Signed-off-by: しらいしななこ <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh13
1 files changed, 12 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index b1c05c9db3..e726f17141 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -24,6 +24,7 @@ resolvemsg= override error message when patch failure occurs
r,resolved to be used after a patch failure
skip skip the current patch
abort restore the original branch and abort the patching operation.
+committer-date-is-author-date lie about committer date
rebasing (internal use for git-rebase)"
. git-sh-setup
@@ -134,6 +135,7 @@ dotest="$GIT_DIR/rebase-apply"
sign= utf8=t keep= skip= interactive= resolved= rebasing= abort=
resolvemsg= resume=
git_apply_opt=
+committer_date_is_author_date=
while test $# != 0
do
@@ -171,6 +173,8 @@ do
git_apply_opt="$git_apply_opt $(sq "$1$2")"; shift ;;
--reject)
git_apply_opt="$git_apply_opt $1" ;;
+ --committer-date-is-author-date)
+ committer_date_is_author_date=t ;;
--)
shift; break ;;
*)
@@ -524,7 +528,14 @@ do
tree=$(git write-tree) &&
parent=$(git rev-parse --verify HEAD) &&
- commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") &&
+ commit=$(
+ if test -n "$committer_date_is_author_date"
+ then
+ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
+ export GIT_COMMITTER_DATE
+ fi &&
+ git commit-tree $tree -p $parent <"$dotest/final-commit"
+ ) &&
git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent ||
stop_here $this