From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: Matthieu.Moy@grenoble-inp.fr, sbeller@google.com, peff@peff.net,
christian.couder@gmail.com, Johannes.Schindelin@gmx.de,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 3/3] rebase: turn git-rebase--*.sh into separate programs
Date: Wed, 17 Feb 2016 20:36:41 +0700 [thread overview]
Message-ID: <1455716201-29784-4-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1455716201-29784-1-git-send-email-pclouds@gmail.com>
This is the first step of turning any of these scripts into C. We can
see now what variables are exchanged between git-rebase.sh and the
subscript (but we don't see all in this patch, variables may have been
exported earlier in git-rebase.sh)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Makefile | 6 +++---
git-rebase--am.sh (mode +x) | 23 ++++++++++++++---------
git-rebase--interactive.sh (mode +x) | 15 +++++++++++++++
git-rebase--merge.sh (mode +x) | 14 ++++++++++++++
git-rebase.sh | 23 ++++++++++++++++-------
5 files changed, 62 insertions(+), 19 deletions(-)
mode change 100644 => 100755 git-rebase--am.sh
mode change 100644 => 100755 git-rebase--interactive.sh
mode change 100644 => 100755 git-rebase--merge.sh
diff --git a/Makefile b/Makefile
index 1ee0ed3..ea636e6 100644
--- a/Makefile
+++ b/Makefile
@@ -486,6 +486,9 @@ SCRIPT_SH += git-mergetool.sh
SCRIPT_SH += git-quiltimport.sh
SCRIPT_SH += git-rebase.sh
SCRIPT_SH += git-remote-testgit.sh
+SCRIPT_SH += git-rebase--am.sh
+SCRIPT_SH += git-rebase--interactive.sh
+SCRIPT_SH += git-rebase--merge.sh
SCRIPT_SH += git-request-pull.sh
SCRIPT_SH += git-stash.sh
SCRIPT_SH += git-submodule.sh
@@ -493,9 +496,6 @@ SCRIPT_SH += git-web--browse.sh
SCRIPT_LIB += git-mergetool--lib
SCRIPT_LIB += git-parse-remote
-SCRIPT_LIB += git-rebase--am
-SCRIPT_LIB += git-rebase--interactive
-SCRIPT_LIB += git-rebase--merge
SCRIPT_LIB += git-rebase--lib
SCRIPT_LIB += git-sh-setup
SCRIPT_LIB += git-sh-i18n
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
old mode 100644
new mode 100755
index 9ae898b..3837f53
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -4,15 +4,19 @@
# Copyright (c) 2010 Junio C Hamano.
#
-# The whole contents of this file is run by dot-sourcing it from
-# inside a shell function. It used to be that "return"s we see
-# below were not inside any function, and expected to return
-# to the function that dot-sourced us.
-#
-# However, FreeBSD /bin/sh misbehaves on such a construct and
-# continues to run the statements that follow such a "return".
-# As a work-around, we introduce an extra layer of a function
-# here, and immediately call it after defining it.
+. git-sh-setup
+. git-sh-i18n
+. git-rebase--lib
+require_work_tree_exists
+
+GIT_QUIET=$git_quiet
+GIT_REFLOG_ACTION=$git_reflog_action
+resolvemsg="
+$(gettext 'When you have resolved this problem, run "git rebase --continue".
+If you prefer to skip this patch, run "git rebase --skip" instead.
+To check out the original branch and stop rebasing, run "git rebase --abort".')
+"
+
git_rebase__am () {
case "$action" in
@@ -99,3 +103,4 @@ move_to_original_branch
}
# ... and then we call the whole thing.
git_rebase__am
+exit_rebase $?
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
old mode 100644
new mode 100755
index c0cfe88..1169920
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -7,6 +7,20 @@
# The original idea comes from Eric W. Biederman, in
# http://article.gmane.org/gmane.comp.version-control.git/22407
#
+
+. git-sh-setup
+. git-sh-i18n
+. git-rebase--lib
+require_work_tree_exists
+
+GIT_QUIET=$git_quiet
+GIT_REFLOG_ACTION=$git_reflog_action
+resolvemsg="
+$(gettext 'When you have resolved this problem, run "git rebase --continue".
+If you prefer to skip this patch, run "git rebase --skip" instead.
+To check out the original branch and stop rebasing, run "git rebase --abort".')
+"
+
# The file containing rebase commands, comments, and empty lines.
# This file is created by "git rebase -i" then edited by the user. As
# the lines are processed, they are removed from the front of this
@@ -1294,3 +1308,4 @@ do_rest
}
# ... and then we call the whole thing.
git_rebase__interactive
+exit_rebase $?
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
old mode 100644
new mode 100755
index 2cc2a6d..f453d15
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -5,6 +5,19 @@
# Copyright (c) 2010 Junio C Hamano.
#
+. git-sh-setup
+. git-sh-i18n
+. git-rebase--lib
+require_work_tree_exists
+
+GIT_QUIET=$git_quiet
+GIT_REFLOG_ACTION=$git_reflog_action
+resolvemsg="
+$(gettext 'When you have resolved this problem, run "git rebase --continue".
+If you prefer to skip this patch, run "git rebase --skip" instead.
+To check out the original branch and stop rebasing, run "git rebase --abort".')
+"
+
prec=4
read_state () {
@@ -165,3 +178,4 @@ finish_rb_merge
}
# ... and then we call the whole thing.
git_rebase__merge
+exit_rebase $?
diff --git a/git-rebase.sh b/git-rebase.sh
index 0c70381..67b847f 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -54,11 +54,6 @@ cd_to_toplevel
LF='
'
ok_to_skip_pre_rebase=
-resolvemsg="
-$(gettext 'When you have resolved this problem, run "git rebase --continue".
-If you prefer to skip this patch, run "git rebase --skip" instead.
-To check out the original branch and stop rebasing, run "git rebase --abort".')
-"
unset onto
unset restrict_revision
cmd=
@@ -121,8 +116,22 @@ run_specific_rebase () {
export GIT_EDITOR
autosquash=
fi
- . git-rebase--$type
- exit_rebase $?
+ git_quiet=$GIT_QUIET
+ git_reflog_action=$GIT_REFLOG_ACTION
+ export GIT_PAGER
+ # these are for write_basic_state()
+ export allow_rerere_autoupdate gpg_sign_opt head_name onto
+ export orig_head state_dir strategy strategy_opts verbose
+ # common variables
+ export action git_reflog_action git_quiet keep_empty
+ export rebase_root restrict_revision revisions upstream
+ # git-rebase--am specific
+ export git_am_opt
+ # git-rebase--interactive specific
+ export autosquash cmd force_rebase onto_name preserve_merges
+ export squash_onto switch_to
+
+ exec git-rebase--$type
}
run_pre_rebase_hook () {
--
2.7.0.377.g4cd97dd
next prev parent reply other threads:[~2016-02-17 13:37 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-10 9:31 GSoC 2016: applications open, deadline = Fri, 19/2 Matthieu Moy
2016-02-10 11:09 ` Johannes Schindelin
2016-02-10 17:44 ` Stefan Beller
2016-02-11 8:36 ` Christian Couder
2016-02-12 7:10 ` Matthieu Moy
2016-02-12 8:29 ` Lars Schneider
2016-02-12 9:11 ` Matthieu Moy
2016-02-12 13:04 ` Jeff King
2016-02-12 13:11 ` Jeff King
2016-02-13 11:21 ` Matthieu Moy
2016-02-16 18:10 ` Stefan Beller
2016-02-17 10:34 ` Matthieu Moy
2016-02-17 10:45 ` Duy Nguyen
2016-02-17 13:36 ` [PATCH 0/3] Turn git-rebase--*.sh to external helpers Nguyễn Thái Ngọc Duy
2016-02-17 13:36 ` [PATCH 1/3] rebase: move common functions to rebase--lib.sh Nguyễn Thái Ngọc Duy
2016-02-17 13:36 ` [PATCH 2/3] rebase: move cleanup code to exit_rebase() Nguyễn Thái Ngọc Duy
2016-02-17 14:03 ` Matthieu Moy
2016-02-17 13:36 ` Nguyễn Thái Ngọc Duy [this message]
2016-02-17 14:05 ` [PATCH 3/3] rebase: turn git-rebase--*.sh into separate programs Matthieu Moy
2016-02-17 14:22 ` [PATCH 0/3] Turn git-rebase--*.sh to external helpers Johannes Schindelin
2016-02-17 14:40 ` Duy Nguyen
2016-02-17 13:09 ` GSoC 2016: applications open, deadline = Fri, 19/2 Johannes Schindelin
2016-02-17 16:04 ` Christian Couder
2016-02-22 9:28 ` Duy Nguyen
2016-02-22 10:22 ` Matthieu Moy
2016-02-22 21:42 ` Jeff King
2016-02-22 21:56 ` Junio C Hamano
2016-02-22 22:02 ` Jeff King
2016-02-23 13:13 ` Matthieu Moy
2016-02-24 10:52 ` Jeff King
2016-02-17 17:24 ` Thomas Gummerer
2016-02-17 18:32 ` Lars Schneider
2016-02-17 18:58 ` Matthieu Moy
2016-02-17 19:03 ` Junio C Hamano
2016-02-17 20:21 ` Matthieu Moy
2016-02-17 20:45 ` Jeff King
2016-02-17 21:33 ` Junio C Hamano
2016-02-18 9:38 ` Carlos Martín Nieto
2016-02-19 8:06 ` GSoC 2016: applications open, libgit2 and git.git Matthieu Moy
2016-02-19 9:46 ` Carlos Martín Nieto
2016-02-29 21:01 ` Git has been accepted as a GSoC 2016 mentor organization! Matthieu Moy
2016-03-08 22:46 ` Jeff King
2016-03-08 23:01 ` Junio C Hamano
2016-03-08 23:03 ` Jeff King
2016-03-09 9:55 ` Matthieu Moy
2016-03-09 14:08 ` Jeff King
2016-03-09 13:50 ` Johannes Schindelin
2016-03-09 19:34 ` Jeff King
2016-02-19 8:09 ` GSoC 2016: applications open, deadline = now => submission Matthieu Moy
2016-02-19 8:18 ` Jeff King
2016-02-19 9:10 ` GSoC 2016: applications open, deadline = now => submitted Matthieu Moy
2016-02-19 11:37 ` Jeff King
2016-02-18 8:41 ` GSoC 2016: applications open, deadline = Fri, 19/2 Lars Schneider
2016-02-18 18:38 ` Stefan Beller
2016-02-18 19:13 ` Junio C Hamano
2016-02-19 7:34 ` Matthieu Moy
2016-02-19 20:35 ` Junio C Hamano
2016-02-20 9:28 ` Johannes Schindelin
2016-02-19 9:23 ` Lars Schneider
2016-02-19 12:49 ` Matthieu Moy
2016-02-19 20:37 ` Junio C Hamano
2016-02-19 11:46 ` Thomas Gummerer
2016-02-19 3:09 ` Duy Nguyen
2016-02-19 3:20 ` Junio C Hamano
2016-02-19 3:29 ` Duy Nguyen
2016-02-19 7:17 ` Matthieu Moy
2016-02-19 9:41 ` Duy Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455716201-29784-4-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).