On Fri, Jan 17, 2020 at 3:45 PM Shourya Shukla
<shouryashukla.oo@xxxxxxxxx> wrote:
> [PATCH 1/3] t6025: modernize style
When sending a new version of a patch series, indicate this via
"[PATCH v2 1/3]", for instance. The -v option of "git format-patch"
can help automate this for you.
> The tests in `t6025-merge-symlinks.sh` were written a long time ago, and
> has a lot of style violations, including the mixed-use of tabs and spaces,
> missing indentations, and other shell script style violations. Update it to
> match the CodingGuidelines.
>
> Signed-off-by: Shourya Shukla <shouryashukla.oo@xxxxxxxxx>
> ---
> diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh
> @@ -10,52 +10,55 @@ if core.symlinks is false.'
> +test_expect_success 'setup' '
> + git config core.symlinks false &&
> + >file &&
> + git add file &&
> + git commit -m initial &&
> + git branch b-symlink &&
> + git branch b-file &&
> + l=$(printf file | git hash-object -t blob -w --stdin) &&
> + echo "120000 $l symlink" |
> + git update-index --index-info &&
As mentioned[1] in the review of v1, this should be written:
echo "120000 $l symlink" | git update-index --index-info &&
[1]: https://lore.kernel.org/git/xmqqftgff1r0.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx/
> + git commit -m master &&
> + git checkout b-symlink &&
> + l=$(printf file-different | git hash-object -t blob -w --stdin) &&
> + echo "120000 $l symlink" |
> + git update-index --index-info &&
> + git commit -m b-symlink &&
> + git checkout b-file &&
> + echo plain-file >symlink &&
> + git add symlink &&
> + git commit -m b-file
> +'
