[PATCH 2/3] fixup! git rebase -i: warn about removed commits
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
git-rebase--interactive.sh | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 9041d15..0117791 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -156,8 +156,17 @@ Commands:
These lines can be re-ordered; they are executed from top to bottom.
+EOF
+ if test $(get_missing_commit_check_level) = error
+ then
+ git stripspace --comment-lines >>"$todo" <<\EOF
+Do not remove any line. Use 'drop' explicitly to remove a commit.
+EOF
+ else
+ git stripspace --comment-lines >>"$todo" <<\EOF
If you remove a line here THAT COMMIT WILL BE LOST.
EOF
+ fi
}
make_patch () {
@@ -931,6 +940,13 @@ checkout_onto () {
git update-ref ORIG_HEAD $orig_head
}
+get_missing_commit_check_level () {
+ check_level=$(git config --get rebase.missingCommitsCheck)
+ check_level=${check_level:-ignore}
+ # Don't be case sensitive
+ printf '%s' "$check_level" | tr 'A-Z' 'a-z'
+}
+
# Check if the user dropped some commits by mistake
# Behaviour determined by rebase.missingCommitsCheck.
# Check if there is an unrecognized command or a
@@ -938,10 +954,7 @@ checkout_onto () {
check_todo_list () {
raise_error=f
- check_level=$(git config --get rebase.missingCommitsCheck)
- check_level=${check_level:-ignore}
- # Don't be case sensitive
- check_level=$(printf '%s' "$check_level" | tr 'A-Z' 'a-z')
+ check_level=$(get_missing_commit_check_level)
case "$check_level" in
warn|error)
--
2.5.0.rc0.10.g7792c2a
Matthieu Moy <matthieu.moy@imag.fr>