From 691d57f59477a512df1a63a115be52bd09560d34 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Thu, 8 Sep 2016 20:44:18 +0100
Subject: [PATCH] update.sh: don't cleanup on update for developers.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We’re defining developers as people who have run a dev-cmd at least
once.
---
 Library/Homebrew/cmd/update.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index ed51444c5c..c87c16a118 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -159,7 +159,7 @@ reset_on_interrupt() {
     git reset --hard "$INITIAL_REVISION" "${QUIET_ARGS[@]}"
   fi
 
-  if [[ -n "$HOMEBREW_DEVELOPER" ]]
+  if [[ -n "$HOMEBREW_NO_UPDATE_CLEANUP" ]]
   then
     pop_stash
   else
@@ -243,7 +243,7 @@ EOS
   if [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]]
   then
 
-    if [[ -z "$HOMEBREW_DEVELOPER" ]]
+    if [[ -z "$HOMEBREW_NO_UPDATE_CLEANUP" ]]
     then
       echo "Checking out $UPSTREAM_BRANCH in $DIR..."
       echo "To checkout $INITIAL_BRANCH in $DIR run:"
@@ -286,7 +286,7 @@ EOS
 
   trap '' SIGINT
 
-  if [[ -n "$HOMEBREW_DEVELOPER" ]]
+  if [[ -n "$HOMEBREW_NO_UPDATE_CLEANUP" ]]
   then
     if [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]]
     then
@@ -335,6 +335,14 @@ EOS
     set -x
   fi
 
+  if [[ -z "$HOMEBREW_UPDATE_CLEANUP" ]]
+  then
+    if [[ -n "$HOMEBREW_DEVELOPER" || -n "$HOMEBREW_DEV_CMD_RUN" ]]
+    then
+      export HOMEBREW_NO_UPDATE_CLEANUP="1"
+    fi
+  fi
+
   if [[ -z "$HOMEBREW_AUTO_UPDATE_SECS" ]]
   then
     HOMEBREW_AUTO_UPDATE_SECS="60"