kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Meta/Reintegrate: need to override GIT_EDITOR 

The user may have his own GIT_EDITOR and overriding EDITOR would
not help making the script non-interactive.
todo
Junio C Hamano 2015-03-06 15:24:35 -08:00
parent e0ab1fb4aa
commit 878a985a8f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Reintegrate
View File

@ -116,7 +116,7 @@ no)
git rerere remaining
return 1
else
EDITOR=: git commit --no-verify
GIT_EDITOR=: git commit --no-verify
echo "Accepted previous resolution"
return 0
fi
@ -170,7 +170,7 @@ no)

rebuild=$(git config "branch.$branch.rebuild" || :)

EDITOR=: git merge $rebuild $accept_rerere --edit "$branch" ||
GIT_EDITOR=: git merge $rebuild $accept_rerere --edit "$branch" ||
accept_rerere ||
exit

@ -187,7 +187,7 @@ no)
echo >&2 "Fixing up the merge"
git cherry-pick --no-commit "refs/merge-fix/$branch" &&
git diff --stat HEAD &&
EDITOR=: git commit --amend -a || exit
GIT_EDITOR=: git commit --amend -a || exit
fi
;;
pick" "*)