Add options --submodule and --conflict

Seb35 · Seb35 · commit 18d343771a66 · 2024-04-07T21:39:47.000+02:00
These options check if considered git directories are submodules (resp.
submodules in merge conflict) compared to the origin directory.

Also, negative options --not-submodule and --no-conflict.
diff --git a/git-iterate b/git-iterate
@@ -57,6 +57,8 @@ branch_type=""
 some_remote=""
 ref_ff_to_ref=""
 ref_strict_ff_to_ref=""
+submodule=""
+conflict=""
 for folder in "$@"
 do
   if [ -z "$options" ]; then
@@ -164,6 +166,22 @@ do
       shift
       ref_strict_ff_to_ref=`echo -n "$folder"|cut -c24-`
       continue
+    elif [ "$folder" = "--submodule" ]; then
+      shift
+      submodule="1"
+      continue
+    elif [ "$folder" = "--not-submodule" ]; then
+      shift
+      submodule="0"
+      continue
+    elif [ "$folder" = "--conflict" ]; then
+      shift
+      conflict="1"
+      continue
+    elif [ "$folder" = "--no-conflict" ]; then
+      shift
+      conflict="0"
+      continue
     fi
   fi
   options="1"
@@ -449,6 +467,30 @@ do
         continue
       fi
     fi
+    if [ -n "$conflict" ]; then
+      status=$(LANG="en" git -C "$OLDPWD" status --short -- "$git_folder"|cut -d' ' -f1)
+      if [ "$status" = "UU" -a "$conflict" = "0" ]; then
+        cd "$OLDPWD"
+        continue
+      elif [ "$status" != "UU" -a "$conflict" = "1" ]; then
+        cd "$OLDPWD"
+        continue
+      fi
+    fi
+    if [ -n "$submodule" ]; then
+      if ! git -C "$OLDPWD" branch >/dev/null 2>&1; then
+        cd "$OLDPWD"
+        continue
+      fi
+      status=$(LANG="en" git -C "$OLDPWD" ls-files --cached --stage --full-name -- "$git_folder"|cut -d' ' -f1)
+      if [ "$status" = "160000" -a "$submodule" = "0" ]; then
+        cd "$OLDPWD"
+        continue
+      elif [ "$status" != "160000" -a "$submodule" = "1" ]; then
+        cd "$OLDPWD"
+        continue
+      fi
+    fi
     if [ "$display_only" = "true" ]; then
       echo "$git_folder"
       cd "$OLDPWD"
