From bec2d678b99ee4dbfb0c12f6124c918575853361 Mon Sep 17 00:00:00 2001
From: Avesh Agarwal <avagarwa@redhat.com>
Date: Wed, 13 Jan 2016 12:11:46 -0500
Subject: [PATCH] Fix panic when sort-by is used with kubectl get.

---
 hack/test-cmd.sh       | 10 ++++++++++
 pkg/kubectl/cmd/get.go |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
index 61bdb3a2a6e..1b2590fa3f2 100755
--- a/hack/test-cmd.sh
+++ b/hack/test-cmd.sh
@@ -1341,6 +1341,16 @@ __EOF__
     [[ "$(grep "Watch for changes to the described resources" "${file}")" ]]
   fi
 
+  #####################
+  # Kubectl --sort-by #
+  #####################
+
+  ### sort-by should not panic if no pod exists
+  # Pre-condition: no POD exists
+  kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" ''
+  # Command
+  kubectl get pods --sort-by="{metadata.name}"
+
   kube::test::clear_all
 }
 
diff --git a/pkg/kubectl/cmd/get.go b/pkg/kubectl/cmd/get.go
index 284e3555052..e20d520ef1b 100644
--- a/pkg/kubectl/cmd/get.go
+++ b/pkg/kubectl/cmd/get.go
@@ -243,7 +243,7 @@ func RunGet(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string
 
 	sorting, err := cmd.Flags().GetString("sort-by")
 	var sorter *kubectl.RuntimeSort
-	if err == nil && len(sorting) > 0 {
+	if err == nil && len(sorting) > 0 && len(objs) > 1 {
 		// TODO: questionable
 		if sorter, err = kubectl.SortObjects(f.Decoder(true), objs, sorting); err != nil {
 			return err