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

Sync with 1.8.4.5

Browse Source
This commit is contained in:
Junio C Hamano 2013-12-02 15:34:44 -08:00
commit be38bee862
4 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/RelNotes/1.8.4.5.txt Normal file
View File

@ -0,0 +1,13 @@
Git v1.8.4.5 Release Notes
==========================
Fixes since v1.8.4.4
--------------------
* Recent update to remote-hg that attempted to make it work better
with non ASCII pathnames fed Unicode strings to the underlying Hg
API, which was wrong.
* "git submodule init" copied "submodule.$name.update" settings from
.gitmodules to .git/config without making sure if the suggested
value was sensible.

3
Documentation/git.txt
View File

@ -48,9 +48,10 @@ Documentation for older releases are available here:
* release notes for * release notes for
link:RelNotes/1.8.5.txt[1.8.5]. link:RelNotes/1.8.5.txt[1.8.5].
* link:v1.8.4.4/git.html[documentation for release 1.8.4.4] * link:v1.8.4.5/git.html[documentation for release 1.8.4.5]
* release notes for * release notes for
link:RelNotes/1.8.4.5.txt[1.8.4.5],
link:RelNotes/1.8.4.4.txt[1.8.4.4], link:RelNotes/1.8.4.4.txt[1.8.4.4],
link:RelNotes/1.8.4.3.txt[1.8.4.3], link:RelNotes/1.8.4.3.txt[1.8.4.3],
link:RelNotes/1.8.4.2.txt[1.8.4.2], link:RelNotes/1.8.4.2.txt[1.8.4.2],

20
git-submodule.sh
View File

@ -612,11 +612,21 @@ cmd_init()
fi fi
# Copy "update" setting when it is not set yet # Copy "update" setting when it is not set yet
upd="$(git config -f .gitmodules submodule."$name".update)" if upd="$(git config -f .gitmodules submodule."$name".update)" &&
test -z "$upd" || test -n "$upd" &&
test -n "$(git config submodule."$name".update)" || test -z "$(git config submodule."$name".update)"
git config submodule."$name".update "$upd" || then
die "$(eval_gettext "Failed to register update mode for submodule path '\$displaypath'")" case "$upd" in
rebase | merge | none)
;; # known modes of updating
*)
echo >&2 "warning: unknown update mode '$upd' suggested for submodule '$name'"
upd=none
;;
esac
git config submodule."$name".update "$upd" ||
die "$(eval_gettext "Failed to register update mode for submodule path '\$displaypath'")"
fi
done done
} }

15
t/t7406-submodule-update.sh
View File

@ -323,6 +323,21 @@ test_expect_success 'submodule update - command in .git/config catches failure'
) )
' '
test_expect_success 'submodule init does not copy command into .git/config' '
(cd super &&
H=$(git ls-files -s submodule | cut -d" " -f2) &&
mkdir submodule1 &&
git update-index --add --cacheinfo 160000 $H submodule1 &&
git config -f .gitmodules submodule.submodule1.path submodule1 &&
git config -f .gitmodules submodule.submodule1.url ../submodule &&
git config -f .gitmodules submodule.submodule1.update !false &&
git submodule init submodule1 &&
echo "none" >expect &&
git config submodule.submodule1.update >actual &&
test_cmp expect actual
)
'
test_expect_success 'submodule init picks up rebase' ' test_expect_success 'submodule init picks up rebase' '
(cd super && (cd super &&
git config -f .gitmodules submodule.rebasing.update rebase && git config -f .gitmodules submodule.rebasing.update rebase &&