On Wed, May 13, 2015 at 7:42 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Junio C Hamano <gitster@xxxxxxxxx> writes:
>
>> Paul Tan <pyokagan@xxxxxxxxx> writes:
>>
>>> Replace the above 2 forms with:
>>>
>>> verbose test "$(cat file)" = expected
>>
>> Quoting is very much a good idea, but I am not enthused by the
>> vision of having to write verbose everywhere in our script.
>>
>> After seeing a script fail, you can run it again with -i -x options;
>> wouldn't it be sufficient?
>
> Just to avoid misunderstanding, I am unhappy if we have to keep
> writing "verbose test" in that exact form.
>
> Just like we invented to help debugging by wrapping "cmp" with
> "test_cmp" (i.e. we want to see if the file contents are the same,
> but a person who debugs can be helped by seeing the differences when
> the expectation is not met), I do not mind if we had a shorter and
> cleanly-named wrapper that we can use consistently. E.g. I do not
> mind something like this in test-lib-functions.sh
>
> test_file_contents () {
> if test "$(cat "$1")" != "$2"
> then
> echo "Contents of file $1 is not $2"
> false
> fi
> }
>
> and used like so:
>
> test_file_contents file expected_string
>
> --
> 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
My build starts breaking from this commit, I'm on a mac.
expecting success:
(cd dst &&
test_must_fail git pull --rebase &&
verbose test 1 = "$(find .git/rebase-apply -name "000*" | wc -l)"
)
First, rewinding head to replay your work on top of it...
Applying: Modified Change 4
Using index info to reconstruct a base tree...
M stuff
Falling back to patching base and 3-way merge...
Merging HEAD with Modified Change 4
Merging:
814f1c3 Change 4
virtual Modified Change 4
found 1 common ancestor:
virtual e369e858ec1aa73d497d02c4f23e5cf4ae2d3c3b
Auto-merging stuff
CONFLICT (content): Merge conflict in stuff
Failed to merge in the changes.
Patch failed at 0001 Modified Change 4
The copy of the patch that failed is found in:
/Users/michael.blume/workspace/git/t/trash
directory.t5520-pull/dst/.git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
command failed: 'test' '1' '=' ' 1'
not ok 33 - git pull --rebase does not reapply old patches
#
# (cd dst &&
# test_must_fail git pull --rebase &&
# verbose test 1 = "$(find .git/rebase-apply -name "000*" | wc -l)"
# )
#
--
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