fixup! lib/core: Support <remote>: syntax when listing refs

ostreedev · Mar 16, 2018 · 676ba21 · 676ba21
1 parent d07f1bf
commit 676ba21
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/libostree/ostree-repo-refs.c b/src/libostree/ostree-repo-refs.c
@@ -629,6 +629,12 @@ _ostree_repo_list_refs_internal (OstreeRepo       *self,
       const char *prefix_path;
       const char *path;
 
+      /* back-compat for flatpak -- see https://github.com/ostreedev/ostree/pull/1286 */
+      g_autofree char *refspec_prefix_owned = NULL;
+      if (g_str_has_suffix (refspec_prefix, ":."))
+        refspec_prefix = refspec_prefix_owned =
+            g_strndup (refspec_prefix, strlen (refspec_prefix) - 1);
+
       if (!ostree_parse_refspec (refspec_prefix, &remote, &ref_prefix, error))
         return FALSE;
 

diff --git a/tests/test-refs.sh b/tests/test-refs.sh
@@ -150,6 +150,9 @@ assert_file_has_content refscount.create6 "^11$"
 #Check that we can list just remote refs
 ${CMD_PREFIX} ostree --repo=repo refs origin: | wc -l > refscount.create7
 assert_file_has_content refscount.create7 "^2$" # origin:remote1 origin:local1
+#Also support :. for backcompat with flatpak
+${CMD_PREFIX} ostree --repo=repo refs origin:. | wc -l > refscount.create8
+assert_file_has_content refscount.create8 "^2$" # origin:remote1 origin:local1
 
 echo "ok refs"