[PATCH] git-merge: warn when -m provided on a fast forward
- From
- J. Bruce Fields <bfields@fieldses.org>
- Date
- Mar 11, 2007, 16:28 UTC
- Message-ID
- <20070311162856.GB629@fieldses.org>
- In-Reply-To
- <20070311160424.GA629@fieldses.org>
Warn the user that the "-m" option is ignored in the case of a fast forward. That may save some confusion in the case where the user doesn't know about fast forwards yet and may not realize that the behavior here is intentional.
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> --- git-merge.sh | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/git-merge.sh b/git-merge.sh index 4afcd95..8b6fcf0 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -294,7 +294,12 @@ f,*) git-update-index --refresh 2>/dev/null new_head=$(git-rev-parse --verify "$1^0") && git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" && - finish "$new_head" "Fast forward" || exit + msg="Fast forward" + if test -n "$have_message" + then + msg="$msg (no commit created; -m option ignored)" + fi + finish "$new_head" "$msg" || exit dropsave exit 0 ;;
-- 1.5.0.gb75812-dirty