Skip to content

Commit

Permalink
Merge branch 'po/insn-editor'
Browse files Browse the repository at this point in the history
* po/insn-editor:
  "rebase -i": support special-purpose editor to edit insn sheet
  • Loading branch information
Junio C Hamano committed Oct 21, 2011
2 parents 0445ba2 + 821881d commit 9ee3d37
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
6 changes: 6 additions & 0 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,12 @@ core.editor::
variable when it is set, and the environment variable
`GIT_EDITOR` is not set. See linkgit:git-var[1].

sequence.editor::
Text editor used by `git rebase -i` for editing the rebase insn file.
The value is meant to be interpreted by the shell when it is used.
It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable.
When not configured the default commit message editor is used instead.

core.pager::
The command that git will use to paginate output. Can
be overridden with the `GIT_PAGER` environment
Expand Down
15 changes: 14 additions & 1 deletion git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,19 @@ do_with_author () {
)
}

git_sequence_editor () {
if test -z "$GIT_SEQUENCE_EDITOR"
then
GIT_SEQUENCE_EDITOR="$(git config sequence.editor)"
if [ -z "$GIT_SEQUENCE_EDITOR" ]
then
GIT_SEQUENCE_EDITOR="$(git var GIT_EDITOR)" || return $?
fi
fi

eval "$GIT_SEQUENCE_EDITOR" '"$@"'
}

pick_one () {
ff=--ff
case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
Expand Down Expand Up @@ -832,7 +845,7 @@ has_action "$todo" ||
die_abort "Nothing to do"

cp "$todo" "$todo".backup
git_editor "$todo" ||
git_sequence_editor "$todo" ||
die_abort "Could not execute editor"

has_action "$todo" ||
Expand Down

0 comments on commit 9ee3d37

Please sign in to comment.