undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix submodule squashing into unrelated commit

Browse Source 
Actually, I think the issue is pretty independent of submodules; when
"git commit" gets an empty parameter, it misinterprets it as a file.

So avoid passing an empty parameter to "git commit".

Actually, this is a nice cleanup, as MSG_FILE and EDIT_COMMIT were mutually
exclusive; use one variable instead

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2009-01-27 12:42:31 +01:00 committed by Junio C Hamano
parent 9674769665
commit 94c88edef7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-rebase--interactive.sh
View File

@ -360,17 +360,15 @@ do_next () {
pick_one -n $sha1 || failed=t pick_one -n $sha1 || failed=t
case "$(peek_next_command)" in case "$(peek_next_command)" in
squash|s) squash|s)
EDIT_COMMIT=
USE_OUTPUT=output USE_OUTPUT=output
MSG_OPT=-F MSG_OPT=-F
MSG_FILE="$MSG" EDIT_OR_FILE="$MSG"
cp "$MSG" "$SQUASH_MSG" cp "$MSG" "$SQUASH_MSG"
;; ;;
*) *)
EDIT_COMMIT=-e
USE_OUTPUT= USE_OUTPUT=
MSG_OPT= MSG_OPT=
MSG_FILE= EDIT_OR_FILE=-e
rm -f "$SQUASH_MSG" || exit rm -f "$SQUASH_MSG" || exit
cp "$MSG" "$GIT_DIR"/SQUASH_MSG cp "$MSG" "$GIT_DIR"/SQUASH_MSG
rm -f "$GIT_DIR"/MERGE_MSG || exit rm -f "$GIT_DIR"/MERGE_MSG || exit
@ -384,7 +382,8 @@ do_next () {
GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \ GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \ GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \ GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
$USE_OUTPUT git commit --no-verify $MSG_OPT "$MSG_FILE" $EDIT_COMMIT || failed=t $USE_OUTPUT git commit --no-verify \
$MSG_OPT "$EDIT_OR_FILE" || failed=t
fi fi
if test $failed = t if test $failed = t
then then

2
t/t3404-rebase-interactive.sh
View File

@ -484,7 +484,7 @@ test_expect_success 'submodule rebase setup' '
git commit -a -m "Three changes submodule" git commit -a -m "Three changes submodule"
' '
test_expect_failure 'submodule rebase -i' ' test_expect_success 'submodule rebase -i' '
FAKE_LINES="1 squash 2 3" git rebase -i A FAKE_LINES="1 squash 2 3" git rebase -i A
' '