Ticket #27485: 0001-Add-support-for-git-managed-portdirs2.patch

base/src/macports1.0/macports.tcl

@@ -2227 +2227 @@
                         incr numfailed
                         continue
                     }
-                } elseif {$git_cmd != "" && [file exists $portdir/.git]} {
-                    set git_commandline "pushd $portdir ; $git_cmd pull --rebase ; popd"
+                } elseif {$git_cmd != "" && ![catch {exec sh -c "cd ${portdir} && $git_cmd rev-parse --is-inside-work-tree"} result]} {
+                    # determine what type of git repository this is
+                    if {![catch {exec sh -c "cd ${portdir} && $git_cmd config --local --get svn-remote.svn.url"} result]} {
+                        set git_action "svn rebase"
+                    } else {
+                        set git_action "pull"
+                    }
+                    set git_commandline "cd ${portdir} && $git_cmd $git_action"
                     ui_debug $git_commandline
                     if {
                         [catch {
@@ -2247 +2253 @@
                         }]
                     } {
                         ui_debug "$::errorInfo"
-                        ui_error "Synchronization of the local ports tree failed doing a git pull --rebase"
+                        ui_error "Synchronization of the local ports tree failed doing a git pull"
                         incr numfailed
                         continue
                     }