omehow intended (so there is a good reason for such a
behavior)?
- is there a good/quick way to figure out "parent path as known to git"
similarly as ls-tree behaves, but for "ls-files" (i.e. a worktree, which might
have submodules renamed but not yet committed etc)?
Thank you in
mporary?) "dirt"
> > which I forgot to reset and it would then get merged etc.
> maybe use --rebase, such that your potential change would bubble
> up and possibly produce a merge conflict?
that is a good idea as a workaround, thanks!
--
Yaroslav O. Halchenk
o not want to miss a case where there was some (temporary?) "dirt"
which I forgot to reset and it would then get merged etc.
--
Yaroslav O. Halchenko
Center for Open Neuroscience http://centerforopenneuroscience.org
Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755
changed_submodule_status helper. e.g smth like
test_expect_unchanged_submodule_status 'submodule update --reset-hard staying
on master when I do a new commit' \
super \
'(cd submodule && git commit --allow-empty -m "new one"' \
'git submodule update --reset-hard submodule'
and kaboom -- we have a new test. If we decide to test more -- just tune up
test_expect_unchanged_submodule_status and done -- all the tests remain
sufficiently prescribed.
What do you think?
--
Yaroslav O. Halchenko
Center for Open Neuroscience http://centerforopenneuroscience.org
Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755
Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419
WWW: http://www.linkedin.com/in/yarik
the potential "merge
--recurse-submodules", or is it easy to describe? ;-)
I wonder if may be instead of pestering you about this config one, I
should ask about pointers on how to accomplish "revert
--recurse-submodules" or where to poke to make it possible to clone
recursively
5 matches
Mail list logo
