Keep branches with unpushed commits as they are

This is the best definition I could come up with for when I feel pkg
should not touch my branch.

Author: jbruechert

include/pkg/load_deps.h

@@ -6,6 +6,6 @@ namespace pkg {
 
 void load_deps(boost::filesystem::path const& repo,
                boost::filesystem::path const& deps_root, bool clone_https,
-               bool force, bool recursive);
+               bool force, bool recursive, const bool drop_wip);
 
 }  // namespace pkg

src/load_deps.cc

@@ -27,7 +27,8 @@ namespace fs = boost::filesystem;
 namespace pkg {
 
 void load_deps(fs::path const& repo, fs::path const& deps_root,
-               bool const clone_https, bool const force, bool const recursive) {
+               bool const clone_https, bool const force, bool const recursive,
+               bool const drop_wip) {
   if (!boost::filesystem::is_directory(deps_root)) {
     boost::filesystem::create_directories(deps_root);
   }
@@ -137,6 +138,22 @@ void load_deps(fs::path const& repo, fs::path const& deps_root,
       }
       executor ex;
       try {
+        if (!drop_wip) {
+          auto const remote_refs =
+              ex.exec(d->path_,
+                      "git branch -r --contains HEAD --format '%(refname)'")
+                  .out_;
+          auto const num_refs = std::ranges::count(remote_refs, '\n');
+          if (num_refs == 0) {
+            fmt::println(
+                "warning: {} has commits that have not been pushed yet. "
+                "Use --drop-wip to check out the commit from .pkg "
+                "nevertheless.",
+                d->path_.string());
+            continue;
+          }
+        }
+
         git_attach(ex, d, force);
         fmt::print("{}: checkout {}\n", d->name(), git_shorten(d, d->commit_));
         repeat = true;

src/main.cc

@@ -21,9 +21,11 @@ int main(int argc, char** argv) {
     printf(
         "Usage:\n"
         "  pkg load | -l      [clone dependencies]\n"
-        "      -h for https        (default: ssh);\n"
-        "      -f for hard reset   (default: checkout)]\n"
-        "      -r for recursive    (default: false)]\n"
+        "      -h          for https        (default: ssh);\n"
+        "      -f          for hard reset   (default: checkout)]\n"
+        "      -r          for recursive    (default: false)]\n"
+        "      --drop-wip  check out ref from .pkg even though there are\n"
+        "                  unpushed changes (default: false)\n"
         "  pkg status | -s    [print status]\n"
         "\n"
         "Common flags - apply everywhere:\n"
@@ -38,7 +40,8 @@ int main(int argc, char** argv) {
       load_deps(fs::path{"."}, fs::path("deps"),  //
                 has_flag(argc - 1, argv + 1, "-h"),  //
                 has_flag(argc - 1, argv + 1, "-f"),  //
-                has_flag(argc - 1, argv + 1, "-r"));
+                has_flag(argc - 1, argv + 1, "-r"),  //
+                has_flag(argc - 1, argv + 1, "--drop-wip"));
     } else if (mode == "status" || mode == "-s") {
       print_status(fs::path{"."}, fs::path("deps"));
     } else {