Merge branch 'organize-into-own-child'

Author: Byron

gitoxide-core/src/organize.rs

@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::{
     ffi::OsStr,
     path::{Path, PathBuf},
@@ -198,9 +199,25 @@ fn handle(
             destination.display()
         )),
         Mode::Execute => {
-            std::fs::create_dir_all(destination.parent().expect("repo destination is not the root"))?;
+            if destination.starts_with(
+                git_workdir
+                    .canonicalize()
+                    .ok()
+                    .map(Cow::Owned)
+                    .unwrap_or(Cow::Borrowed(git_workdir)),
+            ) {
+                let tempdir = tempfile::tempdir_in(canonicalized_destination)?;
+                let tempdest = tempdir
+                    .path()
+                    .join(destination.file_name().expect("repo destination is not the root"));
+                std::fs::rename(git_workdir, &tempdest)?;
+                std::fs::create_dir_all(destination.parent().expect("repo destination is not the root"))?;
+                std::fs::rename(&tempdest, &destination)?;
+            } else {
+                std::fs::create_dir_all(destination.parent().expect("repo destination is not the root"))?;
+                std::fs::rename(git_workdir, &destination)?;
+            }
             progress.done(format!("Moving {} to {}", git_workdir.display(), destination.display()));
-            std::fs::rename(git_workdir, &destination)?;
         }
     }
     Ok(())

tests/journey/ein.sh

@@ -139,6 +139,24 @@ title "Porcelain ${kind}"
                 expect_run_sh $SUCCESSFULLY 'find . -maxdepth 2 | sort'
               }
             )
+
+            (with "--execute with move into subdirectory of itself"
+              (cd example.com
+                rm -Rf a-repo-with-extension origin-and-fork
+                mv one-origin ../
+                cd ..
+                rmdir example.com && mv one-origin example.com
+              )
+              it "succeeds" && {
+                WITH_SNAPSHOT="$snapshot/execute-success-new-root" \
+                expect_run_sh $SUCCESSFULLY "$exe tool organize --execute 2>/dev/null"
+              }
+
+              it "does alter the directory structure as these are already in place" && {
+                WITH_SNAPSHOT="$snapshot/directory-structure-after-organize-to-new-root" \
+                expect_run_sh $SUCCESSFULLY 'find . -maxdepth 2 -type d | sort'
+              }
+            )
           )
           if test "$kind" != "max-pure"; then
           (with "running with no further arguments"

tests/snapshots/porcelain/tool/organize/directory-structure-after-organize-to-new-root

@@ -0,0 +1,8 @@
+.
+./dir
+./example.com
+./example.com/one-origin
+./no-origin
+./no-origin/.git
+./special-origin
+./special-origin/.git