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 1/3] rebase: move common functions to rebase--lib.sh
Date: Wed, 17 Feb 2016 20:36:39 +0700 [thread overview]
Message-ID: <1455716201-29784-2-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1455716201-29784-1-git-send-email-pclouds@gmail.com>
These functions are used by git-rebase--*.sh, which will be made
separate programs later. At that point, we can reinclude rebase--lib.sh
to provide the functions without duplicating code.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Makefile | 1 +
git-rebase--lib.sh (new) | 41 +++++++++++++++++++++++++++++++++++++++++
git-rebase.sh | 42 +-----------------------------------------
3 files changed, 43 insertions(+), 41 deletions(-)
create mode 100644 git-rebase--lib.sh
diff --git a/Makefile b/Makefile
index fc2f1ab..1ee0ed3 100644
--- a/Makefile
+++ b/Makefile
@@ -496,6 +496,7 @@ 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--lib.sh b/git-rebase--lib.sh
new file mode 100644
index 0000000..8bec516
--- /dev/null
+++ b/git-rebase--lib.sh
@@ -0,0 +1,41 @@
+write_basic_state () {
+ echo "$head_name" > "$state_dir"/head-name &&
+ echo "$onto" > "$state_dir"/onto &&
+ echo "$orig_head" > "$state_dir"/orig-head &&
+ echo "$GIT_QUIET" > "$state_dir"/quiet &&
+ test t = "$verbose" && : > "$state_dir"/verbose
+ test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy
+ test -n "$strategy_opts" && echo "$strategy_opts" > \
+ "$state_dir"/strategy_opts
+ test -n "$allow_rerere_autoupdate" && echo "$allow_rerere_autoupdate" > \
+ "$state_dir"/allow_rerere_autoupdate
+ test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt
+}
+
+output () {
+ case "$verbose" in
+ '')
+ output=$("$@" 2>&1 )
+ status=$?
+ test $status != 0 && printf "%s\n" "$output"
+ return $status
+ ;;
+ *)
+ "$@"
+ ;;
+ esac
+}
+
+move_to_original_branch () {
+ case "$head_name" in
+ refs/*)
+ message="rebase finished: $head_name onto $onto"
+ git update-ref -m "$message" \
+ $head_name $(git rev-parse HEAD) $orig_head &&
+ git symbolic-ref \
+ -m "rebase finished: returning to $head_name" \
+ HEAD $head_name ||
+ die "$(gettext "Could not move back to $head_name")"
+ ;;
+ esac
+}
diff --git a/git-rebase.sh b/git-rebase.sh
index cf60c43..dc29474 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -46,6 +46,7 @@ edit-todo! edit the todo list during an interactive rebase
"
. git-sh-setup
. git-sh-i18n
+. git-rebase--lib
set_reflog_action rebase
require_work_tree_exists
cd_to_toplevel
@@ -114,47 +115,6 @@ read_basic_state () {
gpg_sign_opt="$(cat "$state_dir"/gpg_sign_opt)"
}
-write_basic_state () {
- echo "$head_name" > "$state_dir"/head-name &&
- echo "$onto" > "$state_dir"/onto &&
- echo "$orig_head" > "$state_dir"/orig-head &&
- echo "$GIT_QUIET" > "$state_dir"/quiet &&
- test t = "$verbose" && : > "$state_dir"/verbose
- test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy
- test -n "$strategy_opts" && echo "$strategy_opts" > \
- "$state_dir"/strategy_opts
- test -n "$allow_rerere_autoupdate" && echo "$allow_rerere_autoupdate" > \
- "$state_dir"/allow_rerere_autoupdate
- test -n "$gpg_sign_opt" && echo "$gpg_sign_opt" > "$state_dir"/gpg_sign_opt
-}
-
-output () {
- case "$verbose" in
- '')
- output=$("$@" 2>&1 )
- status=$?
- test $status != 0 && printf "%s\n" "$output"
- return $status
- ;;
- *)
- "$@"
- ;;
- esac
-}
-
-move_to_original_branch () {
- case "$head_name" in
- refs/*)
- message="rebase finished: $head_name onto $onto"
- git update-ref -m "$message" \
- $head_name $(git rev-parse HEAD) $orig_head &&
- git symbolic-ref \
- -m "rebase finished: returning to $head_name" \
- HEAD $head_name ||
- die "$(gettext "Could not move back to $head_name")"
- ;;
- esac
-}
apply_autostash () {
if test -f "$state_dir/autostash"
--
2.7.0.377.g4cd97dd
next prev parent reply other threads:[~2016-02-17 13:36 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 ` Nguyễn Thái Ngọc Duy [this message]
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 ` [PATCH 3/3] rebase: turn git-rebase--*.sh into separate programs Nguyễn Thái Ngọc Duy
2016-02-17 14:05 ` 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-2-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).