Changes between Version 40 and Version 41 of StartModMaint


Ignore:
Timestamp:
Dec 22, 2013, 3:50:03 PM (9 years ago)
Author:
Beman Dawes
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • StartModMaint

    v40 v41  
    3434}}}
    3535
    36 The {{{git submodule update}}} may switch submodules back to the detached state, depending on the working copy's exact situation.
    37 
    38 Tests run on git version 1.8.4.msysgit.0
     36The {{{git submodule update}}} will fail if it would result in uncommitted changes being overwritten.
     37
     38The {{{git submodule update}}} may switch submodules back to the detached state, depending on the working copy's exact situation.
     39
     40The following table, based on actual tests run using git version 1.8.4.msysgit.0, shows the effect of {{{git submodule update}}} on a submodule:
    3941
    4042|| '''Branch''' || '''Contents''' || '''Super Origin''' || '''Changes''' ||
    4143|| Detached || Unmodified || Up-to-date || None ||
    4244|| Detached || Unmodified || Behind || Updated ||
    43 || Detached || Uncommitted change || Up-to-date || error: Your local changes to the following files would be overwritten by checkout: README.md Please, commit your changes or stash them before you can switch branches. Aborting Unable to checkout '21955012a27c340a4f812b1cee8c79d15c122900' in submodule path 'sub1' ||
    44 || Detached || Uncommitted change || Behind || error: Your local changes to the following files would be overwritten by checkout: README.md Please, commit your changes or stash them before you can switch branches. Aborting Unable to checkout '21955012a27c340a4f812b1cee8c79d15c122900' in submodule path 'sub1' ||
     45|| Detached || Uncommitted change || Up-to-date || error: Your local changes to the following files would be overwritten by checkout: ... Please, commit your changes or stash them before you can switch branches. Aborting Unable to checkout (SHA...) in submodule path '...' ||
     46|| Detached || Uncommitted change || Behind || error: Your local changes to the following files would be overwritten by checkout: ... Please, commit your changes or stash them before you can switch branches. Aborting Unable to checkout (SHA ...) in submodule path '...' ||
    4547|| Detached || Committed change || Up-to-date || Detached ||
    4648|| Detached || Committed change || Behind || Detached, updated ||
    4749|| {{{master}}} || Unmodified || Up-to-date || Detached ||
    4850|| {{{master}}} || Unmodified || Behind || Updated (but '''not detached''') ||
    49 || {{{master}}} || Uncommitted change || Up-to-date || ||
    50 || {{{master}}} || Uncommitted change || Behind || ||
    51 || {{{master}}} || Committed change || Up-to-date || ||
    52 || {{{master}}} || Committed change || Behind ||  ||
     51|| {{{master}}} || Uncommitted change || Up-to-date || error: Your local changes to the following files would be overwritten by checkout: ... Please, commit your changes or stash them before you can switch branches. Aborting Unable to checkout (SHA...) in submodule path '...' ||
     52|| {{{master}}} || Uncommitted change || Behind || error: Your local changes to the following files would be overwritten by checkout: ... Please, commit your changes or stash them before you can switch branches. Aborting Unable to checkout (SHA...) in submodule path '...' ||
     53|| {{{master}}} || Committed change || Up-to-date || Detached ||
     54|| {{{master}}} || Committed change || Behind ||  Detached, updated ||
    5355|| {{{develop}}} || Unmodified || Up-to-date || Detached ||
    5456|| {{{develop}}} || Unmodified || Behind || Detached, updated ||
    55 || {{{develop}}} || Uncommitted change || Up-to-date || ||
    56 || {{{develop}}} || Uncommitted change || Behind || ||
    57 || {{{develop}}} || Committed change || Up-to-date || ||
    58 || {{{develop}}} || Committed change || Behind || ||
     57|| {{{develop}}} || Uncommitted change || Up-to-date || error: Your local changes to the following files would be overwritten by checkout: ... Please, commit your changes or stash them before you can switch branches. Aborting Unable to checkout (SHA...) in submodule path '...' ||
     58|| {{{develop}}} || Uncommitted change || Behind || error: Your local changes to the following files would be overwritten by checkout: ... Please, commit your changes or stash them before you can switch branches. Aborting Unable to checkout (SHA...) in submodule path '...' ||
     59|| {{{develop}}} || Committed change || Up-to-date || Detached ||
     60|| {{{develop}}} || Committed change || Behind || Detached, updated ||
    5961
    6062To get more information about submodules: