From 9ecc60455854d2862b4546dc18a982a02693a7bc Mon Sep 17 00:00:00 2001
From: morganamilo <morganamilo@gmail.com>
Date: Tue, 12 Jun 2018 21:06:21 +0100
Subject: [PATCH] Reset before editing

Edits where reset via git before building packages. This allows edits to
actually effect the build package.
---
 install.go | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/install.go b/install.go
index b07677db..b890bf6a 100644
--- a/install.go
+++ b/install.go
@@ -182,6 +182,21 @@ func install(parser *arguments) error {
 		}
 	}
 
+	if len(toDiff) > 0 {
+		oldValue := config.NoConfirm
+		config.NoConfirm = false
+		fmt.Println()
+		if !continueTask(bold(green("Proceed with install?")), "nN") {
+			return fmt.Errorf("Aborting due to user")
+		}
+		config.NoConfirm = oldValue
+	}
+
+	err = mergePkgBuilds(do.Aur)
+	if err != nil {
+		return err
+	}
+
 	if config.EditMenu {
 		pkgbuildNumberMenu(do.Aur, do.Bases, remoteNamesCache)
 		toEdit, err = editNumberMenu(do.Aur, do.Bases, remoteNamesCache)
@@ -197,7 +212,7 @@ func install(parser *arguments) error {
 		}
 	}
 
-	if len(toDiff) > 0 || len(toEdit) > 0 {
+	if len(toEdit) > 0 {
 		oldValue := config.NoConfirm
 		config.NoConfirm = false
 		fmt.Println()
@@ -207,11 +222,6 @@ func install(parser *arguments) error {
 		config.NoConfirm = oldValue
 	}
 
-	err = mergePkgBuilds(do.Aur)
-	if err != nil {
-		return err
-	}
-
 	//initial srcinfo parse before pkgver() bump
 	err = parseSRCINFOFiles(do.Aur, srcinfosStale, do.Bases)
 	if err != nil {