treewide: correct several "up-to-date" to "up to date"
Follow the Oxford style, which says to use "up-to-date" before the noun, but "up to date" after it. Don't change plumbing (specifically send-pack.c, but transport.c (git push) also has the same string). This was produced by grepping for "up-to-date" and "up to date". It turned out we only had to edit in one direction, removing the hyphens. Fix a typo in Documentation/git-diff-index.txt while we're there. Reported-by: Jeffrey Manian <jeffrey.manian@gmail.com> Reported-by: STEVEN WHITE <stevencharleswhitevoices@gmail.com> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
3c82eec8fb
commit
7560f547e6
@ -399,7 +399,7 @@ case "$allow_fast_forward,$#,$common,$no_commit" in
|
||||
?,1,"$1",*)
|
||||
# If head can reach all the merge then we are up to date.
|
||||
# but first the most common case of merging one remote.
|
||||
finish_up_to_date "Already up-to-date."
|
||||
finish_up_to_date "Already up to date."
|
||||
exit 0
|
||||
;;
|
||||
t,1,"$head",*)
|
||||
@ -459,7 +459,7 @@ t,1,"$head",*)
|
||||
done
|
||||
if test "$up_to_date" = t
|
||||
then
|
||||
finish_up_to_date "Already up-to-date. Yeeah!"
|
||||
finish_up_to_date "Already up to date. Yeeah!"
|
||||
exit 0
|
||||
fi
|
||||
;;
|
||||
|
@ -41,7 +41,7 @@ fi
|
||||
|
||||
case "$common" in
|
||||
"$merge")
|
||||
echo "Already up-to-date. Yeeah!"
|
||||
echo "Already up to date. Yeeah!"
|
||||
dropheads
|
||||
exit 0
|
||||
;;
|
||||
|
@ -253,7 +253,7 @@ test_expect_success 'merge the added subproj again, should do nothing' '
|
||||
# this shouldn not actually do anything, since FETCH_HEAD
|
||||
# is already a parent
|
||||
result=$(git merge -s ours -m "merge -s -ours" FETCH_HEAD) &&
|
||||
check_equal "${result}" "Already up-to-date."
|
||||
check_equal "${result}" "Already up to date."
|
||||
)
|
||||
'
|
||||
|
||||
|
Reference in New Issue
Block a user