From 615e70ef221c7319679fbcafe151f34a75e26513 Mon Sep 17 00:00:00 2001
From: Jim Powers <jim@corruptmemory.com>
Date: Mon, 18 Nov 2019 07:38:48 -0500
Subject: [PATCH] Rebased upstream - Fixed NPE

---
 context.go      | 2 +-
 context_test.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/context.go b/context.go
index b88b703..13fb523 100644
--- a/context.go
+++ b/context.go
@@ -114,7 +114,7 @@ func (c *Context) Lineage() []*Context {
 	return lineage
 }
 
-// value returns the value of the flag corresponding to `name`
+// Value returns the value of the flag corresponding to `name`
 func (c *Context) Value(name string) interface{} {
 	return c.flagSet.Lookup(name).Value.(flag.Getter).Get()
 }
diff --git a/context_test.go b/context_test.go
index 081a8c4..3cefcca 100644
--- a/context_test.go
+++ b/context_test.go
@@ -3,8 +3,8 @@ package cli
 import (
 	"context"
 	"flag"
-	"sort"
 	"os"
+	"sort"
 	"strings"
 	"testing"
 	"time"
@@ -328,7 +328,7 @@ func TestContextPropagation(t *testing.T) {
 	parent := NewContext(nil, nil, nil)
 	parent.Context = context.WithValue(context.Background(), "key", "val")
 	ctx := NewContext(nil, nil, parent)
-	val := ctx.Value("key")
+	val := ctx.Context.Value("key")
 	if val == nil {
 		t.Fatal("expected a parent context to be inherited but got nil")
 	}