From cfc3ac4d4e1f91605bd990ab6a3fa2581450303a Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Sat, 2 Nov 2024 10:39:21 +0100
Subject: [PATCH] azure-cli.extensions-tool: commit removals last

These are most likely to require human intervention, having them last simplifies rebase.

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/by-name/az/azure-cli/extensions-tool.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py
index 3ba7c3636f40..e6c9a332896f 100644
--- a/pkgs/by-name/az/azure-cli/extensions-tool.py
+++ b/pkgs/by-name/az/azure-cli/extensions-tool.py
@@ -288,15 +288,6 @@ def main() -> None:
     for prev, new in updated:
         logger.info(f"  {prev.pname} {prev.version} -> {new.version}")
 
-    for ext in removed:
-        extensions_local.remove(ext)
-        # TODO: Add additional check why this is removed
-        # TODO: Add an alias to extensions manual?
-        commit_msg = f"azure-cli-extensions.{ext.pname}: remove"
-        _write_extension_set(extension_file, extensions_local)
-        if args.commit:
-            _commit(repo, commit_msg, [extension_file])
-
     for ext in init:
         extensions_local.add(ext)
         commit_msg = f"azure-cli-extensions.{ext.pname}: init at {ext.version}"
@@ -314,6 +305,15 @@ def main() -> None:
         if args.commit:
             _commit(repo, commit_msg, [extension_file])
 
+    for ext in removed:
+        extensions_local.remove(ext)
+        # TODO: Add additional check why this is removed
+        # TODO: Add an alias to extensions manual?
+        commit_msg = f"azure-cli-extensions.{ext.pname}: remove"
+        _write_extension_set(extension_file, extensions_local)
+        if args.commit:
+            _commit(repo, commit_msg, [extension_file])
+
 
 if __name__ == "__main__":
     main()