Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 405814 Details for
Bug 551100
git-r3.eclass - fatal: Path 'test' does not exist in 'refs/git-r3/app-crypt/johntheripper/0/__main__'
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Working submodule patch
git-r3-submodule-r1.patch (text/plain), 1.93 KB, created by
Michał Górny
on 2015-06-26 20:39:48 UTC
(
hide
)
Description:
Working submodule patch
Filename:
MIME Type:
Creator:
Michał Górny
Created:
2015-06-26 20:39:48 UTC
Size:
1.93 KB
patch
obsolete
>Index: git-r3.eclass >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v >retrieving revision 1.49 >diff -u -B -r1.49 git-r3.eclass >--- git-r3.eclass 22 Jun 2015 08:39:36 -0000 1.49 >+++ git-r3.eclass 26 Jun 2015 20:39:05 -0000 >@@ -710,16 +710,23 @@ > local subname=${submodules[0]} > local url=${submodules[1]} > local path=${submodules[2]} >- local commit=$(git rev-parse "${local_ref}:${path}") > >- if [[ ! ${commit} ]]; then >- die "Unable to get commit id for submodule ${subname}" >- fi >+ # use only submodules for which path does exist >+ # (this is in par with 'git submodule'), bug #551100 >+ # note: git cat-file does not work for submodules >+ if [[ $(git ls-tree -d "${local_ref}" "${path}") ]] >+ then >+ local commit=$(git rev-parse "${local_ref}:${path}" || die) >+ >+ if [[ ! ${commit} ]]; then >+ die "Unable to get commit id for submodule ${subname}" >+ fi > >- local subrepos >- _git-r3_set_subrepos "${url}" "${repos[@]}" >+ local subrepos >+ _git-r3_set_subrepos "${url}" "${repos[@]}" > >- git-r3_fetch "${subrepos[*]}" "${commit}" "${local_id}/${subname}" >+ git-r3_fetch "${subrepos[*]}" "${commit}" "${local_id}/${subname}" >+ fi > > submodules=( "${submodules[@]:3}" ) # shift > done >@@ -849,11 +856,16 @@ > local subname=${submodules[0]} > local url=${submodules[1]} > local path=${submodules[2]} >- local subrepos >- _git-r3_set_subrepos "${url}" "${repos[@]}" > >- git-r3_checkout "${subrepos[*]}" "${out_dir}/${path}" \ >- "${local_id}/${subname}" >+ # use only submodules for which path does exist >+ # (this is in par with 'git submodule'), bug #551100 >+ if [[ -d ${out_dir}/${path} ]]; then >+ local subrepos >+ _git-r3_set_subrepos "${url}" "${repos[@]}" >+ >+ git-r3_checkout "${subrepos[*]}" "${out_dir}/${path}" \ >+ "${local_id}/${subname}" >+ fi > > submodules=( "${submodules[@]:3}" ) # shift > done
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 551100
:
405782
| 405814