From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Feb 2019 22:29:53 +0000 (+0900)
Subject: amlook: do not use the reverse mapping
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49e49d68231bb1f01d0273ea972af747d5ed9531;p=thirdparty%2Fgit.git

amlook: do not use the reverse mapping

It's inherently unreliable across renames and cherry-picks.
---

diff --git a/amlook b/amlook
index 0544f402ee..9ab8354f93 100755
--- a/amlook
+++ b/amlook
@@ -7,17 +7,6 @@
 find_commit () {
 	in= commits=
 
-	if test -z "$commits"
-	then
-		blob=$(echo "Message-Id: $1" | git hash-object --stdin)
-		commits=$(git notes --ref amlog show $blob | sed -e '/^$/d')
-	fi
-
-	if test -z "$commits"
-	then
-		commits=$(sed -ne "s|^\([0-9a-f]\{40\}\) $1|\1|p" .git/am.log)
-	fi
-
 	if test -z "$commits"
 	then
 		# I know I know there should be "notes grep" command...
@@ -27,6 +16,11 @@ find_commit () {
 		)
 	fi
 
+	if test -z "$commits"
+	then
+		commits=$(sed -ne "s|^\([0-9a-f]\{40\}\) $1|\1|p" .git/am.log)
+	fi
+
 	if test -z "$commits"
 	then
 		echo "Never applied"