Update git to v2.10.2, fixes #735 #741

yukoff · 2016-11-06T01:54:38Z

Fixes [MINGW64] [gettext] ': not a valid identifierline 89: export: `dashless #735
Import *sh completion and XSS patches from openSUSE

Chocobo1 · 2016-11-07T11:17:51Z

git/PKGBUILD

@@ -45,17 +45,31 @@ replaces=('git-core')
 provides=('git-core')
 #options=('debug' '!strip')
 source=("${pkgname}-${pkgver}.tar.gz"::https://github.com/git/git/archive/v${pkgver}.tar.gz
+        git.keyring


I'm curious, what is the purpose of this file?

It's not used anywhere.

It's a public PGP keyring of git project. It doesn't needed in most cases, it might be used in case of importing some patches from source tree and to verify commit (a tag normally). Just included it for convenience in case someone would require it at some point.

This is extra for us. Remove it.

Sure, done.

Alexpux · 2016-11-14T06:33:35Z

You forget to remove git.keyring file

* Fixes msys2#735 * Import *sh completion and XSS patches from openSUSE

bit2shift · 2016-11-22T20:57:32Z

Still broken on v2.10.2.

yukoff · 2016-11-24T12:24:03Z

What I've found so far - it seems that problem comes from mingw-w64-x86_64-gettext/mingw-w64-i686-gettext (gettext.sh is used in git-sh-i18n):

MING64 shell:

Yury@yk-nb-home MINGW64 /d/Users/Yury/workspace.redmine/redmine
$ which gettext.sh
/mingw64/bin/gettext.sh

Yury@yk-nb-home MINGW64 /d/Users/Yury/workspace.redmine/redmine
$ git stash
': not a valid identifierline 89: export: `dashless
No local changes to save

MING32 shell:

Yury@yk-nb-home MINGW32 /d/Users/Yury/workspace.redmine/redmine
$ which gettext.sh
/usr/bin/gettext.sh

Yury@yk-nb-home MINGW32 /d/Users/Yury/workspace.redmine/redmine
$ git stash
No local changes to save

MSYS shell

Yury@yk-nb-home MSYS /d/Users/Yury/workspace.redmine/redmine
$ which gettext.sh
/usr/bin/gettext.sh

Yury@yk-nb-home MSYS /d/Users/Yury/workspace.redmine/redmine
$ git stash
No local changes to save

Now if I remove mingw-w64-x86_64-gettext:

Yury@yk-nb-home MINGW64 /d/Users/Yury/workspace.redmine/redmine
$ pacman -R -dd mingw-w64-x86_64-gettext
...

Yury@yk-nb-home MINGW64 /d/Users/Yury/workspace.redmine/redmine
$ which gettext.sh
/usr/bin/gettext.sh

Yury@yk-nb-home MINGW64 /d/Users/Yury/workspace.redmine/redmine
$ git stash
No local changes to save

And doing opposite (installing the mingw-w64-i686-gettext for MING32 shell) - BOOM:

Yury@yk-nb-home MINGW32 /d/Users/Yury/workspace.redmine/redmine
$ pacman -S mingw-w64-i686-gettext
resolving dependencies...
looking for conflicting packages...
...

Yury@yk-nb-home MINGW32 /d/Users/Yury/workspace.redmine/redmine
$ which gettext.sh
/mingw32/bin/gettext.sh

Yury@yk-nb-home MINGW32 /d/Users/Yury/workspace.redmine/redmine
$ git stash
': not a valid identifierline 89: export: `dashless
No local changes to save

I've done set -x inside of git-sh-i18n to see what's happening:

Yury@yk-nb-home MINGW32 /d/Users/Yury/workspace.redmine/redmine
$ git stash
+++ TEXTDOMAIN=git
+++ export TEXTDOMAIN
+++ test -z ''
+++ TEXTDOMAINDIR=/usr/share/locale
+++ export TEXTDOMAINDIR
+++ GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
+++ test -n ''
+++ test -n ''
+++ test -n ''
+++ type gettext.sh
+++ GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
+++ export GIT_INTERNAL_GETTEXT_SH_SCHEME
+++ case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
+++ . gettext.sh
++++ test 'X\t' = 'X\t'
++++ echo=echo
++++ test -z ''
++++ case "$0" in
++ unset CDPATH
++ IFS='
'
++ GIT_QUIET=
++ test -n ''
+++ basename -- /usr/lib/git-core/git-stash
+++ sed -e 's/-/ /'
++ dashless='git stash'
++ '[' -z '' ']'
+++ eval_gettext 'usage: $dashless $USAGE'
+++ gettext 'usage: $dashless $USAGE'
++++ envsubst --variables 'usage: $dashless $USAGE'
+++ export PATH $'dashless\r' USAGE
': not a valid identifierline 89: export: `dashless
+++ envsubst 'usage: $dashless $USAGE'
++ LONG_USAGE='usage:  list [<options>]
   or: git stash show [<stash>]
   or: git stash drop [-q|--quiet] [<stash>]
   or: git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]
   or: git stash branch <branchname> [<stash>]
   or: git stash [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
                       [-u|--include-untracked] [-a|--all] [<message>]]
   or: git stash clear'
++ case "$1" in
++ case $(uname -s) in
+++ uname -s
++ test -z ''
++ git_dir_init
+++ git rev-parse --git-dir
++ GIT_DIR=.git
++ '[' -z Yes ']'
++ test -n .git
+++ cd .git
+++ pwd
++ GIT_DIR=/d/Users/Yury/workspace.redmine/redmine/.git
+++ git rev-parse --git-path objects
++ : .git/objects
+ require_work_tree
++ git rev-parse --is-inside-work-tree
+ test true = true
+ cd_to_toplevel
++ git rev-parse --show-toplevel
+ cdup=/d/Users/Yury/workspace.redmine/redmine
+ cd /d/Users/Yury/workspace.redmine/redmine
+ TMP=/d/Users/Yury/workspace.redmine/redmine/.git/.git-stash.4392
++ git rev-parse --git-path index
+ TMPindex=.git/index.stash.4392
+ trap 'rm -f "$TMP-"* "$TMPindex"' 0
+ ref_stash=refs/stash
+ git config --get-colorbool color.interactive
++ git config --get-color color.interactive.help 'red bold'
+ help_color=''
++ git config --get-color '' reset
+ reset_color=''
+ PARSE_CACHE=--not-parsed
+ seen_non_option=
+ test -n ''
+ set save
+ case "$1" in
+ shift
+ save_stash
+ keep_index=
+ patch_mode=
+ untracked=
+ test 0 '!=' 0
+ test -n ''
+ stash_msg=
+ git update-index -q --refresh
+ no_changes
+ git diff-index --quiet --cached HEAD --ignore-submodules --
+ git diff-files --quiet --ignore-submodules
+ test -z ''
++ gettext 'No local changes to save'
+ say 'No local changes to save'
+ test -z ''
+ printf '%s\n' 'No local changes to save'
No local changes to save
+ exit 0
+ rm -f '/d/Users/Yury/workspace.redmine/redmine/.git/.git-stash.4392-*' .git/index.stash.4392

And same for (unaffected) MSYS shell:

Yury@yk-nb-home MSYS /d/Users/Yury/workspace.redmine/redmine
$ git stash
+++ TEXTDOMAIN=git
+++ export TEXTDOMAIN
+++ test -z ''
+++ TEXTDOMAINDIR=/usr/share/locale
+++ export TEXTDOMAINDIR
+++ GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
+++ test -n ''
+++ test -n ''
+++ test -n ''
+++ type gettext.sh
+++ GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
+++ export GIT_INTERNAL_GETTEXT_SH_SCHEME
+++ case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
+++ . gettext.sh
++++ test 'X\t' = 'X\t'
++++ echo=echo
++++ test -z ''
++++ case "$0" in
++ unset CDPATH
++ IFS='
'
++ GIT_QUIET=
++ test -n ''
+++ basename -- /usr/lib/git-core/git-stash
+++ sed -e 's/-/ /'
++ dashless='git stash'
++ '[' -z '' ']'
+++ eval_gettext 'usage: $dashless $USAGE'
+++ gettext 'usage: $dashless $USAGE'
++++ envsubst --variables 'usage: $dashless $USAGE'
+++ export PATH dashless USAGE
+++ envsubst 'usage: $dashless $USAGE'
++ LONG_USAGE='usage: git stash list [<options>]
   or: git stash show [<stash>]
   or: git stash drop [-q|--quiet] [<stash>]
   or: git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]
   or: git stash branch <branchname> [<stash>]
   or: git stash [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
                       [-u|--include-untracked] [-a|--all] [<message>]]
   or: git stash clear'
++ case "$1" in
++ case $(uname -s) in
+++ uname -s
++ test -z ''
++ git_dir_init
+++ git rev-parse --git-dir
++ GIT_DIR=.git
++ '[' -z Yes ']'
++ test -n .git
+++ cd .git
+++ pwd
++ GIT_DIR=/d/Users/Yury/workspace.redmine/redmine/.git
+++ git rev-parse --git-path objects
++ : .git/objects
+ require_work_tree
++ git rev-parse --is-inside-work-tree
+ test true = true
+ cd_to_toplevel
++ git rev-parse --show-toplevel
+ cdup=/d/Users/Yury/workspace.redmine/redmine
+ cd /d/Users/Yury/workspace.redmine/redmine
+ TMP=/d/Users/Yury/workspace.redmine/redmine/.git/.git-stash.6432
++ git rev-parse --git-path index
+ TMPindex=.git/index.stash.6432
+ trap 'rm -f "$TMP-"* "$TMPindex"' 0
+ ref_stash=refs/stash
+ git config --get-colorbool color.interactive
++ git config --get-color color.interactive.help 'red bold'
+ help_color=''
++ git config --get-color '' reset
+ reset_color=''
+ PARSE_CACHE=--not-parsed
+ seen_non_option=
+ test -n ''
+ set save
+ case "$1" in
+ shift
+ save_stash
+ keep_index=
+ patch_mode=
+ untracked=
+ test 0 '!=' 0
+ test -n ''
+ stash_msg=
+ git update-index -q --refresh
+ no_changes
+ git diff-index --quiet --cached HEAD --ignore-submodules --
+ git diff-files --quiet --ignore-submodules
+ test -z ''
++ gettext 'No local changes to save'
+ say 'No local changes to save'
+ test -z ''
+ printf '%s\n' 'No local changes to save'
No local changes to save
+ exit 0
+ rm -f '/d/Users/Yury/workspace.redmine/redmine/.git/.git-stash.6432-*' .git/index.stash.6432

These are differing parts:
the bad

+++ eval_gettext 'usage: $dashless $USAGE'
+++ gettext 'usage: $dashless $USAGE'
++++ envsubst --variables 'usage: $dashless $USAGE'
+++ export PATH $'dashless\r' USAGE
': not a valid identifierline 89: export: `dashless
+++ envsubst 'usage: $dashless $USAGE'

and the good

+++ eval_gettext 'usage: $dashless $USAGE'
+++ gettext 'usage: $dashless $USAGE'
++++ envsubst --variables 'usage: $dashless $USAGE'
+++ export PATH dashless USAGE
+++ envsubst 'usage: $dashless $USAGE'

bit2shift · 2016-11-24T15:16:08Z

export PATH $'dashless\r' USAGE
That's it, the ludicrous bug I've been looking for.

Chocobo1 reviewed Nov 7, 2016

View reviewed changes

mati865 mentioned this pull request Nov 13, 2016

git is broken: "fatal: cannot use .git/info/exclude as an exclude file" #748

Closed

yukoff force-pushed the feature/git-v2.10.2 branch from 383e7c9 to b9ba261 Compare November 14, 2016 06:29

Update git to v2.10.2

cf4ac8a

* Fixes msys2#735 * Import *sh completion and XSS patches from openSUSE

yukoff force-pushed the feature/git-v2.10.2 branch from b9ba261 to cf4ac8a Compare November 14, 2016 06:35

Alexpux merged commit 8987a70 into msys2:master Nov 14, 2016

yukoff mentioned this pull request Nov 24, 2016

[MINGW64] [gettext] ': not a valid identifierline 89: export: `dashless #735

Open

yukoff deleted the feature/git-v2.10.2 branch November 24, 2016 23:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update git to v2.10.2, fixes #735 #741

Update git to v2.10.2, fixes #735 #741

yukoff commented Nov 6, 2016

Chocobo1 Nov 7, 2016

mati865 Nov 13, 2016

yukoff Nov 14, 2016

Alexpux Nov 14, 2016

yukoff Nov 14, 2016

Alexpux commented Nov 14, 2016

bit2shift commented Nov 22, 2016

yukoff commented Nov 24, 2016

bit2shift commented Nov 24, 2016

Update git to v2.10.2, fixes #735 #741

Update git to v2.10.2, fixes #735 #741

Conversation

yukoff commented Nov 6, 2016

Chocobo1 Nov 7, 2016

Choose a reason for hiding this comment

mati865 Nov 13, 2016

Choose a reason for hiding this comment

yukoff Nov 14, 2016

Choose a reason for hiding this comment

Alexpux Nov 14, 2016

Choose a reason for hiding this comment

yukoff Nov 14, 2016

Choose a reason for hiding this comment

Alexpux commented Nov 14, 2016

bit2shift commented Nov 22, 2016

yukoff commented Nov 24, 2016

bit2shift commented Nov 24, 2016