dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-06 16:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

amlook: do not use the reverse mapping

Browse Source 
It's inherently unreliable across renames and cherry-picks.
This commit is contained in:
Junio C Hamano
2019-03-01 07:29:53 +09:00
parent 1bc963bf8c
commit 49e49d6823
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
amlook
View File

@@ -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"