Skip to content

Commit a3d9a36

Browse files
denikclaude
andauthored
Preserve manual .gitattributes entries after genkit regeneration (#4667)
Add .gitattributes.manual for hand-maintained entries (currently the merge=union strategy for NEXT_CHANGELOG.md) and update the generate target to prepend it to the genkit-produced .gitattributes. I have added manual line #4639 but it's overwritten each time "make generate" is ran. --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 2912826 commit a3d9a36

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
NEXT_CHANGELOG.md merge=union
2+
3+
# Generated by genkit update-sdk:
24
cmd/account/access-control/access-control.go linguist-generated=true
35
cmd/account/billable-usage/billable-usage.go linguist-generated=true
46
cmd/account/budget-policy/budget-policy.go linguist-generated=true

.gitattributes.manual

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
NEXT_CHANGELOG.md merge=union
2+
3+
# Generated by genkit update-sdk:

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ generate:
181181
cd $(UNIVERSE_DIR) && bazel build //openapi/genkit
182182
@echo "Generating CLI code..."
183183
$(GENKIT_BINARY) update-sdk
184+
cat .gitattributes.manual .gitattributes > .gitattributes.tmp && mv .gitattributes.tmp .gitattributes
184185
@echo "Updating direct engine config..."
185186
make generate-direct
186187

0 commit comments

Comments
 (0)