Skip to content

Commit 563d834

Browse files
authored
Merge pull request #1141 from ttaylorr/ttaylorr/interim-maintainer
lib: prepare for an interim maintainer
2 parents 609d708 + 9420ded commit 563d834

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

script/lookup-commit.sh

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,12 @@ update_gitgit_dir () {
7070

7171
if git -C "$GITGIT_DIR" rev-parse --verify refs/remotes/gitster/seen >/dev/null 2>&1
7272
then
73+
# Let's take 'seen' from the official source at git.git.
74+
git -C "$GITGIT_DIR" remote set-url gitster https://github.com/git/git
7375
git -C "$GITGIT_DIR" fetch gitster ||
7476
die "Could not update the 'gitster' remote to $GITGIT_DIR"
7577
else
76-
git -C "$GITGIT_DIR" remote add -f gitster https://github.com/gitster/git ||
78+
git -C "$GITGIT_DIR" remote add -f gitster https://github.com/git/git ||
7779
die "Could not add the 'gitster' remote to $GITGIT_DIR"
7880
fi
7981
}
@@ -235,18 +237,9 @@ test notes != "$mode" || {
235237
continue
236238
fi
237239

238-
amlog="$(git -C "$GITGIT_DIR" notes --ref=refs/notes/gitster-amlog show "$commit" 2>/dev/null | head -n 1)"
239-
if test -n "$amlog"
240-
then
241-
amlog=${amlog%>}
242-
amlog=${amlog#Message-Id: <}
243-
printf 'M 100644 inline %s\ndata <<EOF\n%s\nEOF\n' "$commitpath" "$amlog"
244-
continue
245-
fi
246-
247240
# gitk,git-gui patches are often taken via Pull Requests, let's look only at patches from known git.git (interim) maintainers
248241
case "$(git -C "$GITGIT_DIR" show -s --format=%cn "$commit")" in
249-
"Linus Torvalds"|"Junio C Hamano"|"Shawn O. Pearce"|"Jeff King"|"Jonathan Nieder") ;; # these should be mostly on the mailing list
242+
"Linus Torvalds"|"Junio C Hamano"|"Shawn O. Pearce"|"Jeff King"|"Jonathan Nieder"|"Taylor Blau") ;; # these should be mostly on the mailing list
250243
*) continue;; # these are not expected to have been discussed on the mailing list
251244
esac
252245

0 commit comments

Comments
 (0)