From: Luke Shumaker <lukeshu@xxxxxxxxxxx>
The diff between v1 and v2 is largely stylistic. The only
non-stylistic changes are fixing the tests to use `test_must_fail`
instead of `!`, and re-thinking the commit about fussing with PATH.
Ostensibly, this patch set is about improving various aspects of `git
subtree`'s user interface (and it is!), but it's also mostly about
setting the foundation and being "batch 1" of a bunch more changes to
subtree that I'm getting queued up. So please forgive the large
amount of churn in the leading clean-up commits, I promise that
there's more work coming on top of it (we've discovered lots of ways
to break the "subtree split" algorithm, and come up with fixes for
most of them). In the mean-time, I do think that the UX improvements
in this patchset are already worth it themselves.
- The first 11 commits improve subtree's tests, largely around the
code-quality of the tests, but a few of the commits do actually
improve what's being tested.
- The middle 12 commits improve the code-quality of subtree's
implementation.
- The final 7 commits improve various aspects of subtree's user
experience, from readability of the debug output, to documentation,
to option flag handling.
The very last commit is likely to be a little objectionable--it makes
some option flag parsing more strict, so there will probably be worry
that the change breaks existing users. However, it's being strict
about arg combinations that were always invalid, the difference is
that now it reports that to the users and bails. Those users were
already broken, they just didn't know it. `git subtree` should tell
them.
Finally, two questions for my continuing work:
1. Would it be all right to amend CI to run the subtree tests? And if
so, what would be the best way to do it? For my own testing, I just
made the following edit to the main Makefile, but I'm not sure it's
the mos appropriate approach:
--- a/Makefile
+++ b/Makefile
@@ -2836,6 +2836,7 @@
test: all
$(MAKE) -C t/ all
+ $(MAKE) -C contrib/subtree/ test
perf: all
$(MAKE) -C t/perf/ all
The first two commits are about getting that to pass. I'd prefer to
avoid that type of bitrot in the future.
2. If in that work I changed the shebang from "#!/bin/sh" to
"#!/usr/bin/env bash" and started using Bash arrays, would that be so
bad? Would that be land-able?
Luke Shumaker (30):
.gitignore: Ignore /git-subtree
subtree: t7900: update for having the default branch name be 'main'
subtree: t7900: use test-lib.sh's test_count
subtree: t7900: use consistent formatting
v2:
- Also normalize on `test X` instead of `[ X ]`.
- Also normalize on `>FILENAME` with no spaces.
- Fix a few if statements with `if` and `then` on the same line
that I missed in v1.
subtree: t7900: comment subtree_test_create_repo
v2:
- Also switch the few uses of vanilla test_create_repo over to
subtree_test_create_repo. In v1 this was erroneously included
in a different commit.
subtree: t7900: use 'test' for string equality
subtree: t7900: delete some dead code
subtree: t7900: fix 'verify one file change per commit'
v2:
- Fix whitespace.
subtree: t7900: rename last_commit_message to last_commit_subject
subtree: t7900: add a test for the -h flag
subtree: t7900: add porcelain tests for 'pull' and 'push'
v2:
- Don't switch unrelated uses of vanilla test_create_repo over to
subtree_test_create_repo; this has been moved to happen in an
earlier commit.
- Fix whitespace.
subtree: don't have loose code outside of a function
v2:
- Include rationale in the the commit message.
subtree: more consistent error propagation
subtree: drop support for git < 1.7
v2:
- Include rationale in the the commit message.
subtree: use `git merge-base --is-ancestor`
subtree: use git-sh-setup's `say`
subtree: use more explicit variable names for cmdline args
subtree: use "$*" instead of "$@" as appropriate
v2:
- Improve the commit message with quoting and clearer
explanation.
subtree: Don't fuss with PATH
v2:
- This commit changed entirely. In v1 it changed how git-subtree
adjusts the PATH. In v2, it removes any fussing with the PATH,
and in its place adds a pre-flight sanity check that it doesn't
need to fuss with the PATH.
subtree: use "^{commit}" instead of "^0"
subtree: parse revs in individual cmd_ functions
subtree: remove duplicate check
subtree: add comments and sanity checks
v2:
- Expand on the the commit message.
- Fix capitalization in one of the comments.
subtree: don't let debug and progress output clash
v2:
- Reword the commit message to be clearer.
- Add comments to the code.
- Flip the `if` and `else` cases around, so that the comments
read better.
subtree: have $indent actually affect indentation
subtree: give the docs a once-over
v2:
- behaviour -> behavior
subtree: allow --squash to be used with --rejoin
v2:
- In the added tests, use `test_must_fail` instead of `!`, as
appropriate.
subtree: allow 'split' flags to be passed to 'push'
v2:
- In the added tests, use `test_must_fail` instead of `!`, as
appropriate.
subtree: push: allow specifying a local rev other than HEAD
subtree: be stricter about validating flags
.gitignore | 1 +
contrib/subtree/git-subtree.sh | 638 ++++++++-----
contrib/subtree/git-subtree.txt | 184 ++--
contrib/subtree/t/t7900-subtree.sh | 1429 ++++++++++++++++++----------
4 files changed, 1394 insertions(+), 858 deletions(-)
--
2.31.1
Happy hacking,
~ Luke Shumaker
