summaryrefslogtreecommitdiff
path: root/contrib/subtree/git-subtree.sh
diff options
context:
space:
mode:
authorAlexey Shumkin <alex.crezoff@gmail.com>2015-09-04 22:24:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-09-08 18:09:10 (GMT)
commitc61eb4106d9ea77ba770c28a018cafa3b81b927e (patch)
tree415a99d042561b796693c6c030f60bb8ec10018e /contrib/subtree/git-subtree.sh
parentec371ff6e382d660458eeb8c337d4744985bf308 (diff)
downloadgit-c61eb4106d9ea77ba770c28a018cafa3b81b927e.zip
git-c61eb4106d9ea77ba770c28a018cafa3b81b927e.tar.gz
git-c61eb4106d9ea77ba770c28a018cafa3b81b927e.tar.bz2
t7900-subtree: test the "space in a subdirectory name" case
In common case there can be spaces in a subdirectory name. Change tests accorgingly to this statement. Also, as far as a call to the `rejoin_msg` function (in `cmd_split`) does not take into account such a case this patch fixes commit message when `--rejoin` option is set . Besides, as `fixnl` and `multiline` functions did not take into account the "new" tested "space in a subdirectory name" case they become unused and redundant, so they are removed. Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/subtree/git-subtree.sh')
-rwxr-xr-xcontrib/subtree/git-subtree.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 9f06571..72a20c0 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -648,7 +648,7 @@ cmd_split()
debug "Merging split branch into HEAD..."
latest_old=$(cache_get latest_old)
git merge -s ours \
- -m "$(rejoin_msg $dir $latest_old $latest_new)" \
+ -m "$(rejoin_msg "$dir" $latest_old $latest_new)" \
$latest_new >&2 || exit $?
fi
if [ -n "$branch" ]; then