On 04/09/15 07:02, Eric Sunshine wrote:
> On Wed, Sep 2, 2015 at 7:34 PM, Anders Ro <anders.ronnbrant@xxxxxxxxx> wrote:
>> Patch to make it possible to pin submodules so that they are not
>> affected by the --remote option in "git submodule".
>
> Thanks for the patches. I don't use submodules, so I can't comment
> specifically on this change, however, I can offer some general
> comments on the patches. But first, a piece of advice...
>
> Use git-send-email to post the patches as proper emails, one email
> per patch, rather than as attachments. Reviewers are going to want to
> write inline comments on the patches, and they can't do so when the
> patches are attachments, so attaching patches discourages reviewers
> from responding.
Thanks for the advice and the code comments, I knew I would get it wrong
somehow :). I did try to follow an IMAP Gmail guide in a hurry. I'll fix
the code and make sure git send-mail works the next time.
>> git-submodule.sh: pin submodule when branch name is '@'
>>
>> Setting branch name to '@' for a submodule will disable 'git submodule
>> update --remote' calls for that specific submodule. I.e. instead of
>> follow the unspecified default choice of master, nothing is being
>> updated. This is useful when multiple submodules exist but not all
>> should follow the remote branch head.
>
> With the disclaimer that I'm not a submodule user (to which the
> answer might be obvious): What benefit is there in using a magic
> value like this ("@") over, say, an explicit configuration setting?
>From what I have understood (not a submodule expert yet) the '@' is an
invalid branch name and should therefore not collide with any current
branches. My idea was to disable the '--remote' option when the user
have explicitly set an invalid branch name to not modify any current
behaviour. Though having an explicit option is of course more
clarifying. The current behaviour though is that empty branch name means
"follow master" which is somewhat unintuitive.
>> Signed-off-by: Anders Ro <anders.ronnbrant@xxxxxxxxx>
>> ---
>> diff --git a/git-submodule.sh b/git-submodule.sh
>> index 25b1ddf..1bb2bb1 100755
>> --- a/git-submodule.sh
>> +++ b/git-submodule.sh
>> @@ -843,7 +843,8 @@ Maybe you want to use 'update --init'?")"
>> die "$(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")"
>> fi
>>
>> - if test -n "$remote"
>> + # Fetch latest in remote unless branch name in config is '@'
>> + if test -n "$remote" -a "$branch" != "@"
>
> The -a option to 'test' is not portable[1] and is considered obsolete
> by POSIX[2]. Use "test foo && test bar" instead.
>
> [1]: http://www.gnu.org/software/autoconf/manual/autoconf.html#index-g_t_0040command_007btest_007d-1793
> [2]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html
>
>> then
>> if test -z "$nofetch"
>> then
>> @@ -857,6 +858,12 @@ Maybe you want to use 'update --init'?")"
>> die "$(eval_gettext "Unable to find current ${remote_name}/${branch} revision in submodule path '\$sm_path'")"
>> fi
>>
>> + # Inform that the current sm is pinned and use of '--remote' ignored
>> + if test -n "$remote" -a "$branch" = "@"
>
> Ditto.
>
>> + then
>> + say "$(eval_gettext "Submodule path '\$displaypath' pinned, remote update ignored")"
>> + fi
>> +
>
>> Subject: [PATCH 2/2] t7412: add test case for pinned submodules
>>
>> Signed-off-by: Anders Ro <anders.ronnbrant@xxxxxxxxx>
>> ---
>> diff --git a/t/t7412-submodule-pinning.sh b/t/t7412-submodule-pinning.sh
>> new file mode 100755
>> index 0000000..2844b1e
>> --- /dev/null
>> +++ b/t/t7412-submodule-pinning.sh
>> @@ -0,0 +1,73 @@
>> +#!/bin/sh
>> +#
>> +# Copyright (c) 2015 Anders Ronnbrant
>> +#
>> +
>> +test_description="Branch name '@' disables submodule update --remote calls"
>> +
>> +. ./test-lib.sh
>> +
>> +get_sha() {
>> + cd $1 && git rev-list --max-count=1 HEAD
>> +}
>
> A few issues:
>
> Indent with tabs (width 8), not spaces. (This comment applies to the
> entire patch).
>
> Style for shell scripts on this project is to have a space before
> "()".
>
> Taking a hint from t/test-lib-functions.sh:test_cmp_rev(), use "git
> rev-parse --verify" instead.
>
> It's a bit ugly that this does "cd $1" without ever balancing it with
> a return to the original directory. If someone later comes along and
> writes:
>
> get_sha1 fiddle >fiddle-id
>
> in a new test, then that person will be surprised to find that the
> current working directory changed out from under him. The current
> patch doesn't experience this problem since it always invokes it as
> $(get_sha1 fiddle), but it could be made more robust by either
> wrapping it in a subshell so that the 'cd' is undone when the
> subshell exits, or by using "-C $1".
>
> Taking the above comments into account:
>
> get_sha () {
> git -C "$1" rev-parse --verify HEAD
> }
>
>> +equal_sha() {
>> + test "$(get_sha $1)" = "$(get_sha $2)"
>> +}
>> +
>> +not_equal_sha() {
>> + test "$(get_sha $1)" != "$(get_sha $2)"
>> +}
>
> Style: space before "()" on these two function declarations
>
>> +test_expect_success 'setup submodule tree structure' '
>> +for i in 1 2 3; do echo file$i > file$i; git add file$i; git commit -m file$i; done &&
>
> Style: write each command of the 'for' loop on its own line,
> including 'do', don't use semi-colons
>
> Style: no space after redirection operator: >file$i
>
> Keep the &&-chain intact, and end the chain with "|| return $?" so
> that the 'for' loop correctly exits if any contained command fails.
>
> for i in 1 2 3
> do
> echo file$i >file$i &&
> git add file$i &&
> git commit -m file$i || return $?
> done
>
>> +test_tick &&
>
> Why is this needed? There doesn't seem to be any obvious reason for
> its presence, and the test still passes without it.
>
>> +git clone . super &&
>> +git clone . follow &&
>> +git clone . pinned &&
>> +(cd super && git submodule add -b master ../follow follow) &&
>> +(cd super && git submodule add ../pinned pinned)
>
> Style: it's probably better to avoid aligning columns like this since
> it can end up being a maintenance headache, and because the line with
> the extensive blank span can be difficult to read in isolation.
>
> Since both of these execute in directory 'super', this could be
> stated more concisely as:
>
> (
> cd super &&
> git submodule add ... &&
> git submodule add ...
> ) &&
>
> Placement of the subshell parentheses is intentional.
>
>> +'
>> +
>> +test_expect_success 'verify submodules have the same SHA' '
>> +equal_sha super/follow super/pinned
>> +'
>
> Style: indent the test body (using tab); this comment applies to the
> entire patch
>
>> +
>> +
>
> Style: one blank line between tests, not two
>
>> +test_expect_success 'switch submodule pinned to HEAD~1 and commit super' '
>> +(cd super/pinned && git checkout master && git reset --hard HEAD~1) &&
>> +(cd super && git add pinned && git commit -m "Submodule pinned @ HEAD~1") &&
>> +(cd super && git submodule status)
>> +'
>
> Style: one command per line; format subshell as shown in above
> example
>
> You can combine the two 'cd super' bits into a single subshell.
>
>> +
>> +
>> +test_expect_success 'verify submodules not have the same SHA anymore' '
>> +not_equal_sha super/follow super/pinned
>> +'
>
> Each test should be a logical unit. In prose, you might describe a
> test as "set condition A, make change B, and verify that A and B
> resulted in some expected state".
>
> This test is the "verify A and B" part, and the preceding test is the
> "set condition A, make change B" part, however, splitting them up
> like this makes it difficult for the reader to understand how they
> are related. Worse, someone may come along and insert a new test
> between the two, not realizing that these two tests are logically
> one, possibly breaking them.
>
> Consequently, this test should be combined with the one preceding it.
>
>> +
>> +
>> +test_expect_success 'set branch name to "@" for submodule pinned' '
>> +(cd super && git config --replace-all submodule.pinned.branch "@") &&
>> +test "$(cd super && git config --get submodule.pinned.branch)" = "@"
>
> What is the last line testing? It appears to be testing the behavior
> of git-config, which is outside the scope of this test script.
>
>> +'
>> +
>> +
>> +test_expect_success 'run submodule update --remote and expect no change' '
>> +(cd super && git submodule update --remote) &&
>> +not_equal_sha super/follow super/pinned
>> +'
>
> All the above comments apply here too. These two tests are logically
> one, thus should be combined.
>
> Once combined, you can use test_config rather than git-config, since
> test_config will ensure that the config setting is undone when the
> test exits.
>
>> +
>> +
>> +test_expect_success 'remove branch name "@" for submodule pinned (unpin)' '
>> +(cd super && git config --unset-all submodule.pinned.branch) &&
>
> If you take the above advice and use test_config in the previous
> test, then this won't be needed.
>
>> +(cd super && git config --list)
>
> This isn't testing anything at all, but is instead merely cluttering
> the output (when --verbose is enabled). It looks like debugging code
> which should have been removed before committing.
>
>> +'
>> +
>> +
>> +test_expect_success 'run submodule update --remote and expect same SHA1 again' '
>> +(cd super && git submodule update --remote) &&
>
> For these one-line subshells, "-C super" is easier and reads
> better. (This comment also applies to the rest of the patch.)
>
>> +equal_sha super/follow super/pinned
>> +'
>
> This test should be combined with the previous one (although, if you
> follow the advice regarding the previous test, then that test will
> collapse to nothing...).
>
>> +
>> +
>> +test_done
>> --
>> 2.1.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html