Feature: Default branch and path flags intelligently. #3371

twoGiants · 2026-01-19T09:36:32Z

Changes

🎁 Default --path flag to current working directory when empty or "."
🎁 Default --branch flag to current git branch instead of hardcoded "main"
🧹 Consolidate duplicate getCurrentGitBranch from cmd/deploy.go into shared gitCliWrapper
🧹 Reorganize tests: integration tests to cmd/config_ci_int_test.go, unit tests use stubs

/kind enhancement

Relates to #3256

Release Note

The `func config ci` command now resolves --path and --branch flags intelligently:
- --path defaults to current working directory when empty or "."
- --branch defaults to current git branch when not specified (previously "main")

Docs

codecov · 2026-01-19T09:54:46Z

Codecov Report

❌ Patch coverage is 74.46809% with 24 lines in your changes missing coverage. Please review.
✅ Project coverage is 55.58%. Comparing base (f85f66d) to head (08b45f5).
⚠️ Report is 7 commits behind head on main.

Files with missing lines	Patch %	Lines
cmd/common/common.go	81.39%	8 Missing ⚠️
cmd/ci/config.go	66.66%	4 Missing and 2 partials ⚠️
cmd/testing/factory.go	0.00%	4 Missing ⚠️
cmd/ci/writer.go	60.00%	2 Missing ⚠️
pkg/knative/deployer.go	66.66%	1 Missing and 1 partial ⚠️
cmd/deploy.go	0.00%	1 Missing ⚠️
cmd/describe.go	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3371      +/-   ##
==========================================
- Coverage   55.72%   55.58%   -0.15%     
==========================================
  Files         170      173       +3     
  Lines       19963    20061      +98     
==========================================
+ Hits        11125    11151      +26     
- Misses       7728     7793      +65     
- Partials     1110     1117       +7

Flag	Coverage Δ
e2e	`39.71% <25.97%> (-0.04%)`	⬇️
e2e go	`35.50% <16.88%> (+0.03%)`	⬆️
e2e node	`31.27% <16.88%> (+0.14%)`	⬆️
e2e python	`34.98% <16.88%> (-0.15%)`	⬇️
e2e quarkus	`31.39% <16.88%> (+0.12%)`	⬆️
e2e rust	`30.83% <16.88%> (+0.09%)`	⬆️
e2e springboot	`?`
e2e typescript	`31.38% <16.88%> (+0.14%)`	⬆️
integration	`18.60% <6.25%> (-0.03%)`	⬇️
unit macos-14	`44.88% <77.50%> (-0.23%)`	⬇️
unit macos-latest	`44.88% <77.50%> (-0.23%)`	⬇️
unit ubuntu-24.04-arm	`44.97% <74.46%> (-0.27%)`	⬇️
unit ubuntu-latest	`45.77% <77.50%> (-0.24%)`	⬇️
unit windows-latest	`44.90% <77.50%> (-0.23%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

twoGiants · 2026-01-20T09:16:31Z

/cc @gauron99 @matejvasek @lkingland

The PR is ready for review. It looks bigger than it is, because I separated the integration tests from the unit test in a file but there were no new integration tests added. I added just some fixes because they started to fail after I added the new logic.

gauron99

Thanks for the PR! few comments from me

cmd/common/common.go

cmd/config_ci_test.go

cmd/common/common_test.go

gauron99

looks great! found one outdated comment reference otherwise all good from my side

cmd/common/common.go

lkingland

Clean!

I especially like the comprehensive tests, and that the unit tests and integration tests are properly split based on the use of a real FS.

Just one small suggestion about helpful error messages when there's no git repo (see below).

Other than that, it's just the comment David mentioned, and a misbehaving integration test.

lkingland · 2026-01-21T05:51:13Z

cmd/common/common.go

+	if _, err := os.Stat(path); err != nil {
+		return "", err
+	}
+
+	return g.execGitCmdWith("-C", path, "symbolic-ref", "--short", "HEAD")


If I understand this correctly, we'll correctly get errors bubbled up when there's no git repo, but we might want to help out a bit when the user tries to use this without having their Function in source-control. Perhaps slightly more vebose error messaging would be enough?

branch, err := g.execGitCmdWith("-C", path, "symbolic-ref", "--short", "HEAD") if err != nil { return "", fmt.Errorf("could not detect git branch for '%s'. "+ "Has git been initialized for this Function? %w", path, err) } return branch, nil

Yes, much better! Will update 😸 👍

Previously, `func config ci` had no working --path flag and the --branch flag had the "main" branch as default. Now both flags resolve to sensible defaults: - --path defaults to current working directory when empty or "." - --branch defaults to current git branch when not specified The implementation adds a gitCliWrapper in cmd/common that calls `git symbolic-ref --short HEAD` to detect the current branch. This also consolidates the duplicate getCurrentGitBranch function from cmd/deploy.go into the shared wrapper. Tests were reorganized: integration tests using real filesystem moved to cmd/config_ci_int_test.go, while unit tests use stubs for faster isolated testing. New tests cover gitCliWrapper, path resolution, and branch resolution logic. Issue knative#3256 Signed-off-by: Stanislav Jakuschevskij <sjakusch@redhat.com>

gauron99 · 2026-01-21T10:21:35Z

/lgtm

gauron99 · 2026-01-21T10:52:10Z

/approve

knative-prow · 2026-01-21T10:52:17Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gauron99, twoGiants

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [gauron99]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

gauron99 · 2026-01-21T10:52:29Z

/hold

gauron99 · 2026-01-21T10:52:56Z

/unhold

knative-prow bot added the kind/enhancement label Jan 19, 2026

knative-prow bot requested review from dsimansk and jrangelramos January 19, 2026 09:36

knative-prow bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jan 19, 2026

twoGiants force-pushed the issue-778-default-branch-current-branch branch 2 times, most recently from 60e2c3d to c6484ce Compare January 19, 2026 09:44

twoGiants changed the title ~~Feature: Default branch flag to current git branch.~~ Feature: Default branch and path flags intelligently. Jan 19, 2026

twoGiants mentioned this pull request Jan 19, 2026

Implement Github Workflow generation for building and deploying a function to a k8 cluster. #3256

Open

twoGiants force-pushed the issue-778-default-branch-current-branch branch 3 times, most recently from 7c48052 to c1ff8fa Compare January 20, 2026 09:10

knative-prow bot requested review from gauron99, lkingland and matejvasek January 20, 2026 09:16

gauron99 reviewed Jan 20, 2026

View reviewed changes

cmd/common/common.go Outdated Show resolved Hide resolved

cmd/config_ci_test.go Show resolved Hide resolved

cmd/common/common_test.go Outdated Show resolved Hide resolved

twoGiants requested a review from gauron99 January 20, 2026 14:56

gauron99 reviewed Jan 20, 2026

View reviewed changes

cmd/common/common.go Outdated Show resolved Hide resolved

lkingland reviewed Jan 21, 2026

View reviewed changes

twoGiants force-pushed the issue-778-default-branch-current-branch branch from fc0bf27 to f0cad73 Compare January 21, 2026 09:11

twoGiants force-pushed the issue-778-default-branch-current-branch branch from 877551b to 08b45f5 Compare January 21, 2026 10:15

knative-prow bot assigned gauron99 Jan 21, 2026

knative-prow bot added the lgtm Indicates that a PR is ready to be merged. label Jan 21, 2026

knative-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 21, 2026

knative-prow bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 21, 2026

knative-prow bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 21, 2026

knative-prow bot merged commit 66d2f4c into knative:main Jan 21, 2026
43 checks passed

Feature: Default branch and path flags intelligently. #3371

Feature: Default branch and path flags intelligently. #3371

Uh oh!

Conversation

twoGiants commented Jan 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Uh oh!

codecov bot commented Jan 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

twoGiants commented Jan 20, 2026

Uh oh!

gauron99 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gauron99 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lkingland left a comment

Choose a reason for hiding this comment

Uh oh!

lkingland Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

twoGiants Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

gauron99 commented Jan 21, 2026

Uh oh!

gauron99 commented Jan 21, 2026

Uh oh!

knative-prow bot commented Jan 21, 2026

Uh oh!

gauron99 commented Jan 21, 2026

Uh oh!

gauron99 commented Jan 21, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

twoGiants commented Jan 19, 2026 •

edited

Loading

codecov bot commented Jan 19, 2026 •

edited

Loading

lkingland Jan 21, 2026 •

edited

Loading