From 9a45517536ea9961febffe3187bd973ebe251fcb Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 20 Oct 2016 09:15:10 +0200
Subject: [PATCH] update: Make --commit=ID actually download that commit

Before it would fail if the commit wasn't accidentally locally.
---
 app/flatpak-transaction.c | 7 +++++--
 common/flatpak-dir.c      | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/flatpak-transaction.c b/app/flatpak-transaction.c
index 0c7f2cc9..45b22c2e 100644
--- a/app/flatpak-transaction.c
+++ b/app/flatpak-transaction.c
@@ -213,8 +213,11 @@ flatpak_transaction_add_op (FlatpakTransaction *self,
   else
     opname = "update";
   subpaths_str = subpaths_to_string (subpaths);
-  g_debug ("Transaction: %s %s:%s%s",
-           opname, remote, ref, subpaths_str);
+  g_debug ("Transaction: %s %s:%s%s%s%s",
+           opname, remote, ref,
+           commit != NULL ? "@" : "",
+           commit != NULL ? commit : "",
+           subpaths_str);
 
   op = g_hash_table_lookup (self->refs, ref);
   if (op != NULL)
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index a79bd8c4..b8115f4d 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -3489,7 +3489,7 @@ flatpak_dir_update (FlatpakDir          *self,
 
   if (!no_pull)
     {
-      if (!flatpak_dir_pull (self, remote_name, ref, subpaths,
+      if (!flatpak_dir_pull (self, remote_name, checksum_or_latest != NULL ? checksum_or_latest : ref, subpaths,
                              NULL, OSTREE_REPO_PULL_FLAGS_NONE, progress,
                              cancellable, error))
         return FALSE;