diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-02 14:24:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-02 14:24:08 -0700 |
commit | f5e16b2a7ba0ed12e4674f111386643e16692fe9 (patch) | |
tree | 823e268977668485eb5efced6308c193b987de28 /builtin/merge-recursive.c | |
parent | Merge branch 'jk/branch-shortening-funny-symrefs' into maint (diff) | |
parent | submodule--helper, module_clone: catch fprintf failure (diff) | |
download | tgif-f5e16b2a7ba0ed12e4674f111386643e16692fe9.tar.xz |
Merge branch 'sb/submodule-helper-clone-regression-fix' into maint
A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident. This has
been corrected.
* sb/submodule-helper-clone-regression-fix:
submodule--helper, module_clone: catch fprintf failure
submodule--helper: do not borrow absolute_path() result for too long
submodule--helper, module_clone: always operate on absolute paths
submodule--helper clone: create the submodule path just once
submodule--helper: fix potential NULL-dereference
recursive submodules: test for relative paths
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions