From 51400a9fdb8840e0dc30081c2ea4d6cc6f88f706 Mon Sep 17 00:00:00 2001
From: Mustafa Gezen <mustafa@ctrliq.com>
Date: Tue, 1 Nov 2022 02:53:45 +0100
Subject: [PATCH] Add comment (deploy test 2)

---
 apollo/impl/v1/advisory.go   | 1 +
 hack/get_impacted_targets.sh | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/apollo/impl/v1/advisory.go b/apollo/impl/v1/advisory.go
index de6a0e81..0385bf3d 100644
--- a/apollo/impl/v1/advisory.go
+++ b/apollo/impl/v1/advisory.go
@@ -153,6 +153,7 @@ func (s *Server) ListAdvisoriesRSS(_ context.Context, req *apollopb.ListAdvisori
 	}, nil
 }
 
+// GetAdvisory returns a single advisory by name
 func (s *Server) GetAdvisory(_ context.Context, req *apollopb.GetAdvisoryRequest) (*apollopb.GetAdvisoryResponse, error) {
 	if err := req.ValidateAll(); err != nil {
 		return nil, err
diff --git a/hack/get_impacted_targets.sh b/hack/get_impacted_targets.sh
index bece2850..4b464cd3 100755
--- a/hack/get_impacted_targets.sh
+++ b/hack/get_impacted_targets.sh
@@ -14,6 +14,10 @@ git checkout "$PULL_BASE_SHA" --quiet
 bazel-bin/bazel-diff generate-hashes -w "$workspace_dir" -b "$bazel_bin" starting_hashes_json
 
 # Generate ending hashes
+TARGET_HASH="$PULL_PULL_SHA"
+if [[ -z "$TARGET_HASH" ]]; then
+  TARGET_HASH="$(git log "HEAD@{1}" --pretty=format:"%H" --merges -n 1)"
+fi
 git checkout "$PULL_PULL_SHA" --quiet
 bazel-bin/bazel-diff generate-hashes -w "$workspace_dir" -b "$bazel_bin" ending_hashes_json