.
Following patches are:
1. failing tests
2. Fix patch
Alexey Shumkin (2):
t4205 (log-pretty-formats): Add failing tests for the case when
i18n.logOutputEncoding is set
pretty.c: format string with truncate respects logOutputEncoding
pretty.c | 7 +-
t/t4205-log-pretty
.
There were no breakages as far as were no tests for the case
when both a commit message and logOutputEncoding are not UTF-8.
Add failing tests for that which will be fixed in the next patch.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4205-log-pretty-formats.sh | 169
'format_commit_message'.
Correct this by converting a commit message to UTF-8 first (as it
assumed in 7e77df3 (pretty: two phase conversion for non utf-8 commits,
2013-04-19)). Only after that set 'output_enc' variable to an actual
logOutputEncoding.
Signed-off-by: Alexey Shumkin alex.crez
In this reroll (against v1) remarks of Nguyễn are respected.
Comments style changed from C++ to C. variable declaration moved back to
the beginning of a function.
Also, added tests for the same case for git rev-list
(see t6006-rev-list-format.sh)
Alexey Shumkin (2):
t4205, t6006: Add failing
.
There were no breakages as far as were no tests for the case
when both a commit message and logOutputEncoding are not UTF-8.
Add failing tests for that which will be fixed in the next patch.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
Reviewed-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
t
'format_commit_message'.
Correct this by converting a commit message to UTF-8 first (as it
assumed in 7e77df3 (pretty: two phase conversion for non utf-8 commits,
2013-04-19)). Only after that convert a commit message to an actual
logOutputEncoding.
Signed-off-by: Alexey Shumkin alex.crez
On Fri, May 16, 2014 at 11:49:40AM -0700, Junio C Hamano wrote:
Alexey Shumkin alex.crez...@gmail.com writes:
Pretty format string %(N,[ml]trunc)%s truncates subject to a given
length with an appropriate padding. This works for non-ASCII texts when
i18n.logOutputEncoding is UTF-8 only
m. carlson sand...@crustytoothpaste.net CCed as he committed 5e1361c
(log: properly handle decorations with chained tags, 2013-12-17)
Alexey Shumkin (5):
t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
t4041, t4205, t6006, t7102: Don't hardcode tested encoding value
t4205
with chained
tags, 2013-12-17)
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4205-log-pretty-formats.sh | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 2a6278b..f9f33ae 100755
--- a/t/t4205
The tested encoding is always available in a variable. Use it instead of
hardcoding. Also, to be in line with other tests use ISO8859-1
(uppercase) rather then iso8895-1.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4041-diff-submodule-option.sh | 7 +--
t/t4205-log-pretty
.
There were no breakages as far as were no tests for the case
when both a commit message and logOutputEncoding are not UTF-8.
Add failing tests for that which will be fixed in the next patch.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
Reviewed-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
t
'format_commit_message'.
Correct this by converting a commit message to UTF-8 first (as it
assumed in 7e77df3 (pretty: two phase conversion for non utf-8 commits,
2013-04-19)). Only after that convert a commit message to an actual
logOutputEncoding.
Signed-off-by: Alexey Shumkin alex.crez
On Tue, May 20, 2014 at 01:49:31AM +, brian m. carlson wrote:
On Mon, May 19, 2014 at 07:28:17PM +0400, Alexey Shumkin wrote:
The tested encoding is always available in a variable. Use it instead of
hardcoding. Also, to be in line with other tests use ISO8859-1
(uppercase) rather
${added_utf8_part}gt) foo
EOF
-test_format complex-subject-commitencoding-unset-ltrunc
%($truncate_count,ltrunc)%s EOF
+test_format complex-subject-commitencoding-unset-ltrunc
%\\($truncate_count,ltrunc\)%s EOF
commit $head3
.. of complex bodies
commit $head2
--
1.9.0
--
Alexey
On Tue, May 20, 2014 at 06:19:36PM +0400, Alexey Shumkin wrote:
On Tue, May 20, 2014 at 02:54:20PM +0100, Ramsay Jones wrote:
Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk
---
Hi Alexey,
If you need to re-roll your 'as/pretty-truncate' branch, could
you please squash
Added in 0a144b3 (t4205, t6006: add failing tests for the case when
i18n.logOutputEncoding is set, 2014-05-19) tests give no error
(somehow) with Bash as /bin/sh but fail for some other shells.
Quote format strings to avoid errors.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
Suggested
On Tue, May 20, 2014 at 04:01:22PM +0100, Ramsay Jones wrote:
On 20/05/14 15:19, Alexey Shumkin wrote:
On Tue, May 20, 2014 at 02:54:20PM +0100, Ramsay Jones wrote:
Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk
---
Hi Alexey,
If you need to re-roll your 'as/pretty
On Tue, May 20, 2014 at 10:10:46AM -0700, Junio C Hamano wrote:
Alexey Shumkin alex.crez...@gmail.com writes:
AFAIU, Junio already applied my patches (existance of a branch
as/pretty-truncate tells us that). So, we can only send other patches that
fix errors brought with former patches
This patch is redundant then.
It will be squashed into next patch series.
On Tue, May 20, 2014 at 06:48:43PM +0400, Alexey Shumkin wrote:
Added in 0a144b3 (t4205, t6006: add failing tests for the case when
i18n.logOutputEncoding is set, 2014-05-19) tests give no error
(somehow) with Bash
with chained
tags, 2013-12-17)
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4205-log-pretty-formats.sh | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 2a6278b..f9f33ae 100755
--- a/t/t4205
This version (v4) differs from the previuos (v3):
1. Fixed typo ISO8895-1 (vs ISO8859-1)
2. Fixed t4205 test: tested format strings are double-quoted
Alexey Shumkin (5):
t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
t4041, t4205, t6006, t7102: Don't hardcode tested
.
There were no breakages as far as were no tests for the case
when both a commit message and logOutputEncoding are not UTF-8.
Add failing tests for that which will be fixed in the next patch.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
Reviewed-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
Reviewed
'format_commit_message'.
Correct this by converting a commit message to UTF-8 first (as it
assumed in 7e77df3 (pretty: two phase conversion for non utf-8 commits,
2013-04-19)). Only after that convert a commit message to an actual
logOutputEncoding.
Signed-off-by: Alexey Shumkin alex.crez
The tested encoding is always available in a variable. Use it instead of
hardcoding. Also, to be in line with other tests use ISO8859-1
(uppercase) rather then iso8859-1.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4041-diff-submodule-option.sh | 7 +--
t/t4205-log-pretty
Use `tformat` to avoid using of `echo` to complete end of line.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4205-log-pretty-formats.sh | 52 +++
1 file changed, 13 insertions(+), 39 deletions(-)
diff --git a/t/t4205-log-pretty-formats.sh b
--pretty=oneline $oldrev
+ git diff-tree -s --always --encoding=UTF-8 --pretty=oneline $oldrev
echo $LOGEND
}
--
1.8.4.rc1
--
Alexey Shumkin
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info
On Sun, Aug 04, 2013 at 11:14:40AM -0700, Jonathan Nieder wrote:
Alexey Shumkin wrote:
On Fri, Aug 02, 2013 at 04:23:38PM -0700, Jonathan Nieder wrote:
1. Log messages use the configured log output encoding, which is
meant to be whatever encoding works best with local terminals
to.
--
Alexey Shumkin
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
error occured.
Thank you!
--
Alexey Shumkin
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Alexey Shumkin (5):
t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
t7102 (reset): don't hardcode SHA-1 in expected outputs
t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
pretty: Add failing tests: user format ignores i18n.logOutputEncoding
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t6006-rev-list-format.sh | 142 +
1 file changed, 79 insertions(+), 63 deletions(-)
diff --git a/t
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4205-log-pretty-formats.sh | 48 +++
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/t
HEAD
and
$ git reset --hard
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
builtin/reset.c | 8 ++--
builtin/rev-list.c | 1 +
builtin/shortlog.c | 1 +
log-tree.c | 1 +
submodule.c | 3
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t7102-reset.sh | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index df82ec9
HEAD
and
$ git reset --hard
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4041-diff-submodule-option.sh | 35 +
t/t4205-log-pretty-formats.sh| 149 ---
t/t6006-rev-list-format.sh | 85 +++---
t/t7102
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t7102-reset.sh | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index df82ec9
v6 5/5] pretty: --format output should honor logOutputEncoding
reworded log message
Alexey Shumkin (5):
t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
t7102 (reset): don't hardcode SHA-1 in expected outputs
t4205 (log-pretty-formats): don't hardcode SHA-1
not when it formats %s.
The same corruption is true for
$ git diff --submodule=log
and
$ git rev-list --pretty=format:%s HEAD
and
$ git reset --hard
This patch makes pretty --format honor logOutputEncoding when it formats
log message.
Signed-off-by: Alexey Shumkin
it formats %s.
The same corruption is true for
$ git diff --submodule=log
and
$ git rev-list --pretty=format:%s HEAD
and
$ git reset --hard
This patch adds failing tests for the next patch that fixes them.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4041-diff
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t6006-rev-list-format.sh | 140 +
1 file changed, 77 insertions(+), 63 deletions(-)
diff --git a/t
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4205-log-pretty-formats.sh | 48 +++
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/t
On Tue, Jun 25, 2013 at 12:28:02PM -0700, Junio C Hamano wrote:
Alexey Shumkin alex.crez...@gmail.com writes:
4. [PATCH v6 4/5] pretty: Add failing tests: --format output should honor
logOutputEncoding
iso8859-5 encoding reverted back to cp1251 encoding (as it was in v4
series
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t6006-rev-list-format.sh | 140 +
1 file changed, 77 insertions(+), 63 deletions(-)
diff --git a/t
;
to avoid compiler warning on the line logmsg_free(msg, commit);
P.S.
It's all started here
[http://thread.gmane.org/gmane.comp.version-control.git/177634]
Alexey Shumkin (5):
t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
t7102 (reset): don't hardcode SHA-1 in expected
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t7102-reset.sh | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index df82ec9
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4205-log-pretty-formats.sh | 48 +++
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/t
not when it formats %s.
The same corruption is true for
$ git diff --submodule=log
and
$ git rev-list --pretty=format:%s HEAD
and
$ git reset --hard
This patch makes pretty --format honor logOutputEncoding when it formats
log message.
Signed-off-by: Alexey Shumkin
it formats %s.
The same corruption is true for
$ git diff --submodule=log
and
$ git rev-list --pretty=format:%s HEAD
and
$ git reset --hard
This patch adds failing tests for the next patch that fixes them.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4041-diff
On Mon, Jul 01, 2013 at 09:00:55AM +0200, Johannes Sixt wrote:
Am 6/26/2013 12:19, schrieb Alexey Shumkin:
One can set an alias
$ git config alias.lg log --graph --pretty=format:'%Cred%h%Creset
-%C(yellow)%d%Creset %s %Cgreen(%cd) %C(bold blue)%an%Creset'
--abbrev-commit
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t7102-reset.sh | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index df82ec9
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t6006-rev-list-format.sh | 140 +
1 file changed, 77 insertions(+), 63 deletions(-)
diff --git a/t
:
`commit_msg` function become more readable
5. [PATCH v8 5/5] pretty: --format output should honor logOutputEncoding
untouched
P.S.
It's all started here
[http://thread.gmane.org/gmane.comp.version-control.git/177634]
Alexey Shumkin (5):
t6006 (rev-list-format): don't hardcode SHA-1
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4205-log-pretty-formats.sh | 48 +++
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/t
not when it formats %s.
The same corruption is true for
$ git diff --submodule=log
and
$ git rev-list --pretty=format:%s HEAD
and
$ git reset --hard
This patch makes pretty --format honor logOutputEncoding when it formats
log message.
Signed-off-by: Alexey Shumkin
it formats %s.
The same corruption is true for
$ git diff --submodule=log
and
$ git rev-list --pretty=format:%s HEAD
and
$ git reset --hard
This patch adds failing tests for the next patch that fixes them.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4041-diff
On Tue, Jul 02, 2013 at 12:41:03PM -0700, Junio C Hamano wrote:
Alexey Shumkin alex.crez...@gmail.com writes:
v8 of this patch series includes the following changes against v7:
Oops, isn't this already in 'next'? In that case, please feed
incremental updates on top of the patches
On Tue, Jul 02, 2013 at 09:22:09AM +0200, Johannes Sixt wrote:
Am 7/2/2013 0:50, schrieb Alexey Shumkin:
On Mon, Jul 01, 2013 at 09:00:55AM +0200, Johannes Sixt wrote:
Am 6/26/2013 12:19, schrieb Alexey Shumkin:
test_expect_success 'setup complex body' '
git config i18n.commitencoding
CC this to Johannes Sixt
On Wed, Jul 03, 2013 at 09:18:08PM +0100, John Keeping wrote:
My system doesn't have the en_US.UTF-8 locale (or plain en_US), which
causes t4205 to fail by counting bytes instead of UTF-8 codepoints.
Instead of using sed for this, use Perl which behaves predictably
http://thread.gmane.org/gmane.comp.version-control.git/229291
this is why CCed
CC this to Johannes Sixt
On Wed, Jul 03, 2013 at 09:18:08PM +0100, John Keeping wrote:
My system doesn't have the en_US.UTF-8 locale (or plain en_US), which
causes t4205 to fail by counting bytes instead of
On Wed, Jul 03, 2013 at 02:41:06PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
My system doesn't have the en_US.UTF-8 locale (or plain en_US), which
causes t4205 to fail by counting bytes instead of UTF-8 codepoints.
Instead of using sed for this, use Perl which
On Wed, Jul 03, 2013 at 10:53:03PM +0100, John Keeping wrote:
On Wed, Jul 03, 2013 at 02:41:06PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
My system doesn't have the en_US.UTF-8 locale (or plain en_US), which
causes t4205 to fail by counting bytes instead of
This patch series is an incremental updates on top of (7c375214 t4205:
replace .\+ with ..* in sed commands, 2013-07-01) as far as v7 patches
were applied to the 'next' branch but there were more improvements made
in v8.
Alexey Shumkin (5):
t4041, t4205, t6006, t7102: use iso8859-1 rather than
Function 'test_format' is become hard to read after its change in
de6029a2d7734a93a9e27b9c4471862a47dd8123. So, make it more elegant.
Also, change 'commit_msg' function to make it more pretty.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
Improved-by: Johannes Sixt j.s...@viscovery.net
This is actually a fixup of de6029a2d7734a93a9e27b9c4471862a47dd8123,
which was applied before final patch series was sent.
Also, see 3994e8a98dc7bbf67e61d23c8125f44383499a1f for the explanation
of such a replacement.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
Reviewed-by: Johannes
In de6029a2d7734a93a9e27b9c4471862a47dd8123 'complex-subject' test was
changed. Revert it back, and add two more tests to test encoding
conversions with no i18n.commitEncoding set.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
Reviewed-by: Johannes Sixt j.s...@viscovery.net
---
t/t6006
In previuos commit de6029a2d7734a93a9e27b9c4471862a47dd8123 single
quotes were replaced with double quotes to make $(commit_msg)
expression in heredoc to work. The same effect can be achieved by using
EOF as a heredoc delimiter instead of \EOF.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
On Fri, Jul 05, 2013 at 12:04:34AM -0700, Junio C Hamano wrote:
Alexey Shumkin alex.crez...@gmail.com writes:
+test_format complex-body %b EOF
+commit $head3
+This commit message is much longer than the others,
+and it will be encoded in iso8859-1. We should therefore
+include
On Thu, Jul 04, 2013 at 11:47:04PM -0700, Junio C Hamano wrote:
Alexey Shumkin alex.crez...@gmail.com writes:
This is actually a fixup of de6029a2d7734a93a9e27b9c4471862a47dd8123,
which was applied before final patch series was sent.
Also, see 3994e8a98dc7bbf67e61d23c8125f44383499a1f
On Thu, Jul 04, 2013 at 11:45:57PM -0700, Junio C Hamano wrote:
Alexey Shumkin alex.crez...@gmail.com writes:
Function 'test_format' is become hard to read after its change in
de6029a2d7734a93a9e27b9c4471862a47dd8123. So, make it more elegant.
Also, change 'commit_msg' function to make
On Fri, Jul 05, 2013 at 01:11:49AM -0700, Junio C Hamano wrote:
Alexey Shumkin alex.crez...@gmail.com writes:
Both iso8859-1 and iso-8859-1 are understood as latin-1
by modern platforms, but the latter is not understood by
older platforms;update tests to use the former
On Fri, Jul 05, 2013 at 01:44:07AM -0700, Junio C Hamano wrote:
Alexey Shumkin alex.crez...@gmail.com writes:
Perhaps like this.
Function 'test_format' has become harder to read after its
change in de6029a2 (pretty: Add failing tests: --format output
should honor
.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
Suggested-by: Johannes Sixt j.s...@viscovery.net
---
t/t4205-log-pretty-formats.sh | 106 +-
1 file changed, 53 insertions(+), 53 deletions(-)
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log
For testing truncated log messages 'commit_msg' function uses `sed` to
cut a message. On various platforms `sed` behaves differently and
results of its work depend on locales installed. So, avoid using `sed`.
Use predefined expected outputs instead of calculated ones.
Signed-off-by: Alexey
is an incremental updates on top of (7c375214 t4205:
replace .\+ with ..* in sed commands, 2013-07-01) as far as v7 patches
were applied to the 'next' branch but there were more improvements made
in v8.
Alexey Shumkin (5):
t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1
t4205 (log-pretty
to test
encoding conversions with no i18n.commitEncoding set.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
Suggested-by: Johannes Sixt j.s...@viscovery.net
---
t/t6006-rev-list-format.sh | 41 -
1 file changed, 28 insertions(+), 13 deletions(-)
diff
as far as there
are no tests expected to fail. We can keep that for future use.
Also, reformat comments
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
Improved-by: Johannes Sixt j.s...@viscovery.net
---
t/t4205-log-pretty-formats.sh | 3 ++-
t/t6006-rev-list-format.sh| 28
Both iso8859-1 and iso-8859-1 are understood as latin-1
by modern platforms, but the latter is not understood by
older platforms; update tests to use the former.
This is in line with 3994e8a9 (t4201: use ISO8859-1 rather
than ISO-8859-1, 2009-12-03), which did the same.
Signed-off-by: Alexey
Options are taken from Git source/mergetools/vim
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
git-gui/lib/mergetool.tcl | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl
index 3c8e73b..4fc1cab 100644
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
git-gui/lib/mergetool.tcl | 9 +
1 file changed, 9 insertions(+)
diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl
index 4fc1cab..837ce17 100644
--- a/git-gui/lib/mergetool.tcl
+++ b/git-gui/lib/mergetool.tcl
Also added Russian translation of the added error message
%s cannot be used without a base
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
git-gui/lib/mergetool.tcl | 10 ++
git-gui/po/ru.po | 4
2 files changed, 14 insertions(+)
diff --git a/git-gui/lib
Wf!
Reroll my patches again after 1.5 years ;)
They must be applied against v1.8.1.1
Sorry for my laziness ;)
Alexey Shumkin (4):
t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
t7102 (reset): refactoring: don't hardcode SHA-1 in expected outputs
pretty: Add failing
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t6006-rev-list-format.sh | 130 +
1 file changed, 72 insertions(+), 58 deletions(-)
diff --git
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t7102-reset.sh | 41 +
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/t/t7102
HEAD
and
$ git reset --hard
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t4041-diff-submodule-option.sh | 33 ---
t/t4205-log-pretty-formats.sh| 43 +++
t/t6006-rev-list-format.sh | 90 ++--
t/t7102
Bump
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
applying them every time after each Git update as I did last 1.5 years
with other patches which still are not submitted, because I'm too lazy
to follow Git development workflow in my free time )
On Wed, Jan 23, 2013 at 11:16 PM, Alexey Shumkin
alex.crez...@gmail.com wrote:
Options are taken from
Alexey Shumkin alex.crez...@gmail.com writes:
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index c248509..4db43a4 100755
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
...
@@ -112,12 +133,12 @@ commit $head2
commit $head1
EOF
Alexey Shumkin alex.crez...@gmail.com writes:
The following two commands are expected to give the same output to
a terminal:
$ git log --oneline --no-color
$ git log --pretty=format:'%h %s'
However, the former pays attention to i18n.logOutputEncoding
configuration, while
Alexey Shumkin alex.crez...@gmail.com writes:
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
Looks good ( refactoring: in the title may not want to be there,
though).
oops
Alexey Shumkin alex.crez...@gmail.com writes:
The expected SHA-1 digests are always available in variables. Use
them instead of hardcoding.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t6006-rev-list-format.sh | 130
+ 1
Why do we want whatever_7 variables and use cut -c1-7 to produce
them? Is 7 something we care deeply about?
I think what we care a lot more than 7 that happens to be the
current default value is to make sure that, if we ever update the
default abbreviation length to a larger value, the
-by: Alexey Shumkin alex.crez...@gmail.com
Reviewed-by: Jeff King p...@peff.net
---
git-web--browse.sh | 2 +-
t/t9901-git-web--browse.sh | 57 +-
2 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/git-web--browse.sh b/git-web
Alexey Shumkin alex.crez...@gmail.com writes:
Why do we want whatever_7 variables and use cut -c1-7 to
produce them? Is 7 something we care deeply about?
I think what we care a lot more than 7 that happens to be the
current default value is to make sure that, if we ever update
messages.
So already quoted printable email subject may be encoded as quoted printable
again. Due to this bug email subject looks corrupted in email clients.
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
git-send-email.perl | 5
t/t9001-send-email.sh | 66
Reroll patch after all suggestions
Alexey Shumkin (2):
t9901-git-web--browse.sh: Use write_script helper
git-web--browser: avoid errors in terminal when running Firefox on
Windows
git-web--browse.sh | 2 +-
t/t9901-git-web--browse.sh | 59
Use write_script helper as suggested by Junio C Hamano.
Also, replace `pwd` with $(pwd) call convention.
Suggested-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
---
t/t9901-git-web--browse.sh | 6 ++
1 file changed, 2 insertions(+), 4 deletions
-by: Alexey Shumkin alex.crez...@gmail.com
Reviewed-by: Jeff King p...@peff.net
---
git-web--browse.sh | 2 +-
t/t9901-git-web--browse.sh | 53 +-
2 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/git-web--browse.sh b/git-web
> contrib/subtree/git-subtree.sh |2 +-
> contrib/subtree/t/Makefile | 31 +-
> contrib/subtree/t/t7900-subtree.sh | 1366 +--
> 3 files changed, 956 insertions(+), 443 deletions(-)
>
--
Alexey Shumkin
E-mail: alex.crez...@gmail.com
--
T
On Fri, Sep 04, 2015 at 04:08:06PM -0700, Junio C Hamano wrote:
> Alexey Shumkin <alex.crez...@gmail.com> writes:
>
> > Some repositories may have spaces in their paths. Currently `git-subtree`
> > raises an error in such cases.
> > Also, `git-subtree` currently doe
` and `multiline` functions did not take into account
the "new" tested "space in a subdirectory name" case they become unused
and redundant, so they are removed.
Signed-off-by: Alexey Shumkin <alex.crez...@gmail.com>
---
contrib/subtree/git-subtree.sh | 2 +-
contrib/
1 - 100 of 102 matches
Mail list logo
