pr-git-2331/HaraldNordgren/suggest-remote-branch-slips-v2
tagged this
24 Jun 21:55
When the repository or upstream argument is a slip like "origin/main" or "origin main", suggest the intended "git push origin main" or "git branch --set-upstream-to=origin/main" form instead of failing with an unrelated error. Changes in v2: * Rewrote both commit messages to lead with the intended command, the easy slip, and the resulting error, instead of the terse original. * Gated each suggestion on advice_enabled() up front, so a user who silenced the hint pays no remote/ref lookups and falls through to the original error. Extracted the detection logic into helpers (die_if_repo_looks_like_ref, die_if_upstream_looks_like_remote) so each call site reads as a single guarded line. Harald Nordgren (2): branch: suggest <remote>/<branch> on upstream slip push: suggest <remote> <branch> for a slash slip Documentation/config/advice.adoc | 5 +++++ advice.c | 1 + advice.h | 1 + builtin/branch.c | 26 ++++++++++++++++++++++ builtin/push.c | 31 +++++++++++++++++++++++++- t/t3200-branch.sh | 38 ++++++++++++++++++++++++++++++++ t/t5529-push-errors.sh | 31 ++++++++++++++++++++++++++ 7 files changed, 132 insertions(+), 1 deletion(-) base-commit: ab776a62a78576513ee121424adb19597fbb7613 Submitted-As: https://lore.kernel.org/git/pull.2331.v2.git.git.1782338114.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.2331.git.git.1781262619.gitgitgadget@gmail.com