Re: Request: Extra case for %G? format

(and return U for untrusted good). > > I wouldn't mind adding E to %G? in the ERRSIG case, even though one has > to look at %GG in any case (N or E) if one wants to have more details. That would be great. As long as %G? can tell between a signed but uncheckable commit and an unsigned commit, then it's good for me. > > Cheers, > Michael Thanks, Alex

Request: Extra case for %G? format

Hello all, Could the %G? format differentiate between an unsigned commit and a signed commit that you're missing a public key for? If `git show --format=%GG --no-patch ' produces an output like the following: gpg: Signature made using RSA key ID gpg: Can't check signature: public key not

[PATCH 3/5] git-rebase--interactive: fix English grammar

Signed-off-by: Alex Henrie <alexhenri...@gmail.com> --- git-rebase--interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 7e558b0..6fd6d4e 100644 --- a/git-rebase--interactive.sh +++ b/git-

[PATCH 5/5] unpack-trees: do not capitalize "working"

In English, only proper nouns are capitalized. Signed-off-by: Alex Henrie <alexhenri...@gmail.com> --- unpack-trees.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 11c37fb..c87a90a 100644 --- a/unpack-trees.c +++ b/unpack-t

[PATCH 4/5] git-merge-octopus: do not capitalize "octopus"

In English, only proper nouns are capitalized. Signed-off-by: Alex Henrie <alexhenri...@gmail.com> --- git-merge-octopus.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index 308eafd..bcf0d92 100755 --- a/git-merge-octo

[PATCH 2/5] cat-file: put spaces around pipes in usage string

This makes the style a little more consistent with other usage strings, and will resolve a warning at https://www.softcatala.org/recursos/quality/git.html Signed-off-by: Alex Henrie <alexhenri...@gmail.com> --- builtin/cat-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[PATCH 1/5] am: put spaces around pipe in usage string

This makes the style a little more consistent with other usage strings, and will resolve a warning at https://www.softcatala.org/recursos/quality/git.html Signed-off-by: Alex Henrie <alexhenri...@gmail.com> --- builtin/am.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

Re: on Amazon EFS (NFS): "Reference directory conflict: refs/heads/" with status code 128

On Thu, Aug 25, 2016 at 2:28 AM, Michael Haggerty <mhag...@alum.mit.edu> wrote: > On 08/24/2016 11:39 PM, Jeff King wrote: >> On Wed, Aug 24, 2016 at 04:52:33PM -0400, Alex Nauda wrote: >> >>> Elastic File System (EFS) is Amazon's scalable filesystem product that >

Re: [L10N] Kickoff of translation for Git 2.10.0 round 1

2016-08-20 10:01 GMT-06:00 Jean-Noël AVILA <jn.av...@free.fr>: > 2. in sequencer.c, there is a mistake in the original string to translate > "Cannot revert during a another revert" There's also "In both case" in git-rebase--interactive.sh. -Alex -- To unsubscri

on Amazon EFS (NFS): "Reference directory conflict: refs/heads/" with status code 128

Elastic File System (EFS) is Amazon's scalable filesystem product that is exposed to the OS as an NFS mount. We're using EFS to host the filesystem used by a Jenkins CI server. Sometimes when Jenkins tries to git fetch, we get this error: $ git -c core.askpass=true fetch --tags --progress

[PATCH 2/2] git-gui: ensure the file in the diff pane is in the list of selected files

the file in the list to make it selected. Signed-off-by: Alex Riesen <alexander.rie...@cetitec.com> --- lib/diff.tcl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/diff.tcl b/lib/diff.tcl index 0d56986..30bdd69 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -127,6 +127,9 @@ proc sho

[PATCH 1/2] git-gui: support for $FILENAMES in tool definitions

into the separate names. Note that the file marked and diffed immediately after starting the GUI up, is not actually selected. One must click on it once to really select it. Signed-off-by: Alex Riesen <alexander.rie...@cetitec.com> --- lib/tools.tcl | 3 +++ 1 file changed, 3 insertions(+)

Re: [PATCH 1/2] Support for $FILENAMES in tool definitions

Jakub Narębski, Mon, Jun 27, 2016 19:28:07 +0200: > On 2016-06-27, Alex Riesen wrote: > > > This adds a FILENAMES environment variable, which contains the repository > > pathnames of all selected files the list. > > The variable contains the names separated by space

Re: [PATCH 1/2] Support for $FILENAMES in tool definitions

Johannes Schindelin, Mon, Jun 27, 2016 17:49:30 +0200: > On Mon, 27 Jun 2016, Alex Riesen wrote: > > > This adds a FILENAMES environment variable, which contains the repository > > pathnames of all selected files the list. > > The variable contains the names separated by

Re: [PATCH 2/2] Ensure the file in the diff pane is always in the list of selected files

Jakub Narębski, Mon, Jun 27, 2016 19:32:25 +0200: > W dniu 2016-06-27 o 15:23, Alex Riesen pisze: > > It is very confusing that the file, diff of which is displayed and which is > > marked as selected in the file list, is not, in fact, selected. I.e. the > > array >

[PATCH 2/2] Ensure the file in the diff pane is always in the list of selected files

{}}} { } else { start_show_diff $cont_info } + + global current_diff_path selected_paths + set selected_paths($current_diff_path) 1 } proc show_unmerged_diff {cont_info} { -- 2.9.0.45.g28c608e.dirty To: Cc: Bcc: Subject: Reply-To: Alex Riesen

[PATCH 1/2] Support for $FILENAMES in tool definitions

starting the GUI up, is not actually selected. One must click on it once to really select it. Signed-off-by: Alex Riesen <alexander.rie...@cetitec.com> --- One day the FILENAME and FILENAMES will have to be fixed to properly pass the file names with spaces. Sorry, I couldn't find how

[PATCH v2] unpack-trees: fix English grammar in do-this-before-that messages

Signed-off-by: Alex Henrie <alexhenri...@gmail.com> --- t/t1011-read-tree-sparse-checkout.sh | 2 +- t/t7607-merge-overwrite.sh | 2 +- t/t7609-merge-co-error-msgs.sh | 10 +- unpack-trees.c | 18 +- 4 files changed, 16 inse

[PATCH] unpack-trees: fix English grammar in do-this-before-that messages

Signed-off-by: Alex Henrie <alexhenri...@gmail.com> --- unpack-trees.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 6bc9512..11c37fb 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -62,17 +62,17 @

Fwd: Stash and Stash Pop Exit Codes

I was wondering why git stash exits with a 0 code when it can't stash anything and why git stash pop exits nonzero when it can't stash pop anything. I was trying to script something and wanted to check if anything was stashed before stash popping. -- To unsubscribe from this list: send the line

Re: compactionHeuristic=true is not used by interactive staging

I see, it makes sense ;-) Indeed it would seem logical to have all commands showing diffs (diff, add -p, log -p, reset -p, etc..) respect the diff options. Thanks for your quick answer! 2016-06-14 23:45 GMT+02:00 Junio C Hamano : > Jeff King writes: > >> Nobody

compactionHeuristic=true is not used by interactive staging

` will format patches differently. Perhaps this is intended and there is a way to force interactive staging to use specific diff options, but I did not find it in the doc. Thanks, Alex -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.

Re: [PATCH] stripspace: Call U+0020 a "space" instead of a "blank"

2016-02-09 16:00 GMT-07:00 Junio C Hamano <gits...@pobox.com>: > Stefan Beller <sbel...@google.com> writes: > >> On Tue, Feb 9, 2016 at 2:24 PM, Junio C Hamano <gits...@pobox.com> wrote: >>> Alex Henrie <alexhenri...@gmail.com> writes: >>

Re: [PATCH] blame: display a more helpful error message if the file was deleted

Sorry, wrong patch...this issue has already been fixed -Alex -- 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

[PATCH] blame: display a more helpful error message if the file was deleted

'--' to separate paths from revisions, like this: 'git [...] -- [...]'" That way, the user knows to rewrite the command as `git blame 22414770 -- generate-cmdlist.perl`. Signed-off-by: Alex Henrie <alexhenri...@gmail.com> --- builtin/blame.c | 2 -- 1 file changed, 2 deletions(-)

[PATCH] stripspace: Call U+0020 a "space" instead of a "blank"

I couldn't find any other examples of people referring to this character as a "blank". Signed-off-by: Alex Henrie <alexhenri...@gmail.com> --- builtin/stripspace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/stripspace.c b/builtin/stripspace

[PATCH] blame: display a more helpful error message if the file was deleted

'--' to separate paths from revisions, like this: 'git [...] -- [...]'" That way, the user knows to rewrite the command as `git blame 22414770 -- generate-cmdlist.perl`. Signed-off-by: Alex Henrie <alexhenri...@gmail.com> --- builtin/blame.c | 2 -- 1 file changed, 2 deletions(-)

git branch in Bash subshell "$(git branch -a)" including ls output as part of return?

Hello Folks, I am Running OSX 10.10.5 Yosemite along with git 2.6.3 installed via homebrew package manager. I recently stumbled across the following bug in some scripting I was doing. "git branch -a --list" and "git branch -a" seem to include the output of an "ls" command if executed as part of

Re: git branch in Bash subshell "$(git branch -a)" including ls output as part of return?

ot;porcelain" command such as "git > branch" at all, but instead look at using something like "git > for-each-ref", perhaps with the --format=%(refname) option, grepping out > master and iterating through the rest. -- Alex Jones | Software Engineer 919-238-4404

Re: [PATCH] pull: add angle brackets to usage string

2015-10-19 23:17 GMT-06:00 Junio C Hamano <gits...@pobox.com>: > Alex Henrie <alexhenri...@gmail.com> writes: > >> 2015-10-16 11:42 GMT-06:00 Junio C Hamano <gits...@pobox.com>: >>> >>> Yes, but that fixes historical "mistake", n

Re: [PATCH] pull: add angle brackets to usage string

2015-10-16 11:42 GMT-06:00 Junio C Hamano <gits...@pobox.com>: > Alex Henrie <alexhenri...@gmail.com> writes: > >> 2015-10-16 10:36 GMT-06:00 Junio C Hamano <gits...@pobox.com>: >>> Makes sense, as all the other in the usage string are >>&

Re: [PATCH] pull: add angle brackets to usage string

s a historical record. The last patch I submitted, b7447679e84ed973430ab19fce87f56857b83068, also modified contrib/examples. -Alex -- 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

[PATCH] pull: add angle brackets to usage string

Signed-off-by: Alex Henrie <alexhenri...@gmail.com> --- builtin/pull.c | 2 +- contrib/examples/git-pull.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/pull.c b/builtin/pull.c index a39bb0a..bf3fd3f 100644 --- a/builtin/pull.c +++ b/builtin/

Re: [PATCH] gitk: l10n: Update Catalan translation

eters is still OK. My guess is that it is the same bug that <http://article.gmane.org/gmane.comp.version-control.git/278863> describes. -Alex -- 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

Re: [PATCH] gitk: l10n: Update Catalan translation

2015-10-05 23:38 GMT-06:00 Junio C Hamano <gits...@pobox.com>: > Alex Henrie <alexhenri...@gmail.com> writes: > >> The gitk included in git 2.6.0 crashes if run from a Catalan locale. >> I'm hoping that a translation update will fix this. > > I seriously h

[PATCH] gitk: l10n: Update Catalan translation

The gitk included in git 2.6.0 crashes if run from a Catalan locale. I'm hoping that a translation update will fix this. Signed-off-by: Alex Henrie <alexhenri...@gmail.com> --- po/ca.po | 53 + 1 file changed, 25 insertions(+), 28 del

[PATCH] merge: Fix English grammar in please-commit-before-merge message.

Signed-off-by: Alex Henrie <alexhenri...@gmail.com> --- advice.c | 2 +- contrib/examples/git-pull.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/advice.c b/advice.c index 4965686..4dc5cf1 100644 --- a/advice.c +++ b/advice.c @@ -100,7 +100,7 @

Re: git commit -a -m is not working

Hi, Thank you for your quick and precise support. Can you share with me some best practices in deploying a web project? I wave one remote repository, many local repositories (each/developer) and a shared hosting server. What should I do to push quickly all changes to my shared server? Alex

git commit -a -m is not working

Hi, This command is not working. Any advice? Alex:testGit Alex$ git commit -a -m 'made a change' On branch v1.0 Untracked files: new_branch.txt nothing added to commit but untracked files present -- To unsubscribe from this list: send the line "unsubscribe git" in the body of

Re: [PATCH] show-ref: place angle brackets around variables in usage string

to reword all four usage strings for increased clarity. -Alex -- 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

[PATCH] show-ref: place angle brackets around variables in usage string

Signed-off-by: Alex Henrie alexhenri...@gmail.com --- builtin/show-ref.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/show-ref.c b/builtin/show-ref.c index dfbc314..131ef28 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -8,7 +8,7 @@ static const char

[PATCH] show-ref: place angle brackets around variable in usage string

Signed-off-by: Alex Henrie alexhenri...@gmail.com --- builtin/show-ref.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/show-ref.c b/builtin/show-ref.c index dfbc314..d9c1633 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -8,7 +8,7 @@ static const char

[PATCH] git-submodule: remove extraneous space from error message

Signed-off-by: Alex Henrie alexhenri...@gmail.com --- git-submodule.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-submodule.sh b/git-submodule.sh index 36797c3..25b1ddf 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -904,7 +904,7 @@ Maybe you want to use

[PATCH] pack-objects: place angle brackets around variables in usage strings

Signed-off-by: Alex Henrie alexhenri...@gmail.com --- builtin/pack-objects.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 62cc16d..1c63f8f 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -25,8

[PATCH] reflog: add missing single quote to error message

The error message can be seen by running `git config gc.reflogexpire foo` and then `git reflog expire`. Signed-off-by: Alex Henrie alexhenri...@gmail.com --- builtin/reflog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/reflog.c b/builtin/reflog.c index 7ed0e85

git init with template dir

by this behavior and wanted to disable it? - Alex -- 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

Re: git init with template dir

, Alex -- 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

[PATCH v2] gitk: Remove mc parameter from proc show_error

` is run. Signed-off-by: Alex Henrie alexhenri...@gmail.com --- gitk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitk b/gitk index 30fcd30..096389f 100755 --- a/gitk +++ b/gitk @@ -1894,13 +1894,13 @@ proc make_transient {window origin} { } } -proc show_error {w

Re: gitk drawing bug

shift-F5, it sometimes draw the history differently (still valid, but drawn differently). There is no change in the repository between the shift-F5 keystrokes. Did you ever contact the gitk maintainer, Paul Mackerras pau...@samba.org, about this bug? -Alex -- To unsubscribe from this list: send

Re: [PATCH] standardize usage strings that were missed the first time

a code freeze, you held onto patches or committed them to a staging branch. But it's OK, I will resend after 2.4 final is released. Thanks for the clarification. -Alex -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

[PATCH] gitk: Remove mc parameter from proc show_error

This partially reverts commit 8d849957d81fc0480a52570d66cc3c2a688ecb1b. This change makes the string OK translatable and the string mc not translatable. It will take effect the next time `make update-po` is run. Signed-off-by: Alex Henrie alexhenri...@gmail.com --- gitk | 4 ++-- 1 file changed

[PATCH] gitk: Fix bad English grammar Matches none Commit Info

Signed-off-by: Alex Henrie alexhenri...@gmail.com --- gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk b/gitk index 9a2daf3..30fcd30 100755 --- a/gitk +++ b/gitk @@ -4066,7 +4066,7 @@ set known_view_options { {committer t15 . --committer=* {mc Committer

[PATCH] standardize usage strings that were missed the first time

This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b. Signed-off-by: Alex Henrie alexhenri...@gmail.com --- builtin/blame.c | 2 +- builtin/log.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index 06484c2..0b2f4ed

[PATCH] branch: fix funny-sounding error message

Signed-off-by: Alex Henrie alexhenri...@gmail.com --- builtin/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/branch.c b/builtin/branch.c index 1d15037..c0b4bae 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -972,7 +972,7 @@ int cmd_branch(int argc

Re: [PATCH] gitk: Remove tcl-format flag from a message that shouldn't have it

2015-02-23 15:30 GMT-07:00 Alex Henrie alexhenri...@gmail.com: 2015-02-16 16:27 GMT-07:00 Alex Henrie alexhenri...@gmail.com: 2015-02-09 14:55 GMT-07:00 Junio C Hamano gits...@pobox.com: Alex Henrie alexhenri...@gmail.com writes: This is just a friendly reminder that this patch has been

Re: [PATCH] gitk: Remove tcl-format flag from a message that shouldn't have it

2015-02-16 16:27 GMT-07:00 Alex Henrie alexhenri...@gmail.com: 2015-02-09 14:55 GMT-07:00 Junio C Hamano gits...@pobox.com: Alex Henrie alexhenri...@gmail.com writes: This is just a friendly reminder that this patch has been sitting in the mailing list archives for a couple of weeks

Re: [PATCH] gitk: Remove tcl-format flag from a message that shouldn't have it

2015-02-09 14:55 GMT-07:00 Junio C Hamano gits...@pobox.com: Alex Henrie alexhenri...@gmail.com writes: This is just a friendly reminder that this patch has been sitting in the mailing list archives for a couple of weeks, and it has not yet been accepted or commented on. I think

Re: [PATCH] gitk: Remove tcl-format flag from a message that shouldn't have it

Hi, This is just a friendly reminder that this patch has been sitting in the mailing list archives for a couple of weeks, and it has not yet been accepted or commented on. -Alex -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org

[PATCH v2] l10n: gitk/ca.po: add Catalan translation

Signed-off-by: Alex Henrie alexhenri...@gmail.com --- The only difference between version 1 and version 2 of this patch is the correction of trailing whitespace in a single message. Please let me know whether this patch is going to be included in Git 2.3.0. gitk-git/po/ca.po | 1349

[PATCH] l10n: gitk/ca.po: add Catalan translation

Signed-off-by: Alex Henrie alexhenri...@gmail.com --- gitk-git/po/ca.po | 1349 + 1 file changed, 1349 insertions(+) create mode 100644 gitk-git/po/ca.po diff --git a/gitk-git/po/ca.po b/gitk-git/po/ca.po new file mode 100644 index 000

[PATCH] gitk: Remove tcl-format flag from a message that shouldn't have it

from freaking out when % o doesn't appear in the translated string. The corrected flag will appear in each translation's po file the next time the translation is updated with `make update-po`. Signed-off-by: Alex Henrie alexhenri...@gmail.com --- gitk-git/gitk | 1 + 1 file changed, 1 insertion

Re: [PATCH] Documentation/init-db.txt: minor style and synopsys fixes

transitioning to using hyphens to separate words in template placeholders, so here you would have template-directory and git-dir. -Alex -- 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

Re: [PATCH v2] standardize usage info string format

2015-01-12 22:29 GMT-07:00 Scott Schmit i.g...@comcast.net: On Wed, Jan 07, 2015 at 11:28:21PM -0700, Alex Henrie wrote: diff --git a/builtin/diff-files.c b/builtin/diff-files.c index 9200069..1abeba6 100644 --- a/builtin/diff-files.c +++ b/builtin/diff-files.c @@ -11,7 +11,7

[PATCH v2] standardize usage info string format

parameter names - Adding spaces to [-f|--foobar] to make [-f | --foobar] - Replacing foobar* with [foobar...] Signed-off-by: Alex Henrie alexhenri...@gmail.com --- Documentation/CodingGuidelines | 8 ++-- advice.c | 2 +- archive.c | 4 ++-- builtin

[PATCH] standardize usage info string format

parameter names - Adding spaces to [-f|--foobar] to make [-f | --foobar] - Replacing foobar* with [foobar...] Signed-off-by: Alex Henrie alexhenri...@gmail.com --- advice.c | 2 +- archive.c | 4 ++-- builtin/add.c | 2 +- builtin/apply.c

Re: [PATCH v3] send-email: Improve format of smtp initialization error message

What's about output like this: Unable to initialize SMTP properly. Check config and use --smtp-debug. VALUES: server=smtp.gmail.com encryption= hello=localhost.localdomain port=587 Junio C Hamano gits...@pobox.com @ 2014-12-30 00:50 QYZT: Alexander Kuleshov

Re: Fix wrong catalan translation

translation, including the one you mentioned: https://github.com/alexhenrie/git-po/pull/1 Hopefully it will be done soon. -Alex -- 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

[PATCH] builtin/remote.c: add missing space to user-facing message

Signed-off-by: Alex Henrie alexhenri...@gmail.com --- builtin/remote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/remote.c b/builtin/remote.c index 7f28f92..c55c7ce 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -13,7 +13,7 @@ static const char * const

Re: error: core.autocrlf=input conflicts with core.eol=crlf

config --global core.autocrlf input;git config core.eol crlf;git config core.autocrlf false;git status $ mkdir -p /tmp/ex4_$$;cd /tmp/ex4_$$;git init;git config --global core.autocrlf input;git -c core.eol=crlf -c core.autocrlf=false status Alex -- To unsubscribe from this list: send the line

error: core.autocrlf=input conflicts with core.eol=crlf

core.autocrlf=false status I tested with git versions 1.9.3 and 2.1.0. Alex -- 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

Re: [PATCH] exec_cmd: system_path memory leak fix

Junio C Hamano gits...@pobox.com @ 2014-11-24 13:37 ALMT: [jc: added those who were mentioned but were missing back to Cc] On Sun, Nov 23, 2014 at 11:02 PM, Alex Kuleshov kuleshovm...@gmail.com wrote: Junio C Hamano: Fixing these callers are done as separate patches, that can be applied

Re: [PATCH] exec_cmd: system_path memory leak fix

Now system_path returns path which is allocated string to callers; It prevents memory leaks in some places. All callers of system_path are owners of path string and they must release it. Added new parameter to wrapper.c/int access_or_die - etc_config, because only etc_config in this case use

Re: Re*: [PATCH] change contract between system_path and it's callers

Junio C Hamano gits...@pobox.com @ 2014-11-25 01:33 ALMT: -static const char *git_etc_gitattributes(void) +static char *git_etc_gitattributes(void) Hmph, I think this should keep returning const char *, as the caller is not expected to free the pointer or write into the memory held by the

Re: [PATCH] exec_cmd: system_path memory leak fix

Junio C Hamano gits...@pobox.com @ 2014-11-24 00:51 ALMT: 0xAX kuleshovm...@gmail.com writes: Signed-off-by: 0xAX kuleshovm...@gmail.com --- The comment on names I've already mentioned elsewhere. Yes, i understand about names. You need a better explanation than a no log message, as you

Re: [PATCH] exec_cmd: system_path memory leak fix

Signed-off-by: Alex Kuleshov kuleshovm...@gmail.com --- exec_cmd.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/exec_cmd.c b/exec_cmd.c index 698e752..7ed9bcc 100644 --- a/exec_cmd.c +++ b/exec_cmd.c @@ -13,7 +13,7 @@ const char *system_path(const char *path) #else

Re: [PATCH] exec_cmd: system_path memory leak fix

Jeff King: If I am reading this right, calls to system_path() will always reuse the same buffer, even if they are called with another path argument. So all callers must make sure to make a copy if they are going to hold on to it for a long time. Grepping for callers shows us saving the result

Re: [PATCH 1/1] gitk: po/ru.po russian translation typo fixed

Hello Max and Paul, thank you for your feedback, so what's must be my next workflow? Resend patch with Reviewed-By:... or somethine else? -- Best regards. 0xAX -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

Re: [PATCH 1/1] git-config: git-config --list fixed when GIT_CONFIG value starts with ~/

Hello Eric and Jeff, Eric Sunshine A few issues: (1) Style: s/char* /char */ (2) Avoid declaration (of 'newpath') after statement. (3) You can drop 'newpath' altogether and just assign the result of expand_user_path() directly to given_config_source.file. This code is potentially leaking the

t9902-completion.sh failed

Hello all, i just got git from master (f6f61cbbad0611e03b712cc354f1665b5d7b087e), built and installed it successfully, now i'm running make test and got following error: *** t9902-completion.sh *** t9902-completion.sh: 118: /home/shk/dev/git/t/../contrib/completion/git-completion.bash: Syntax

Re: t9902-completion.sh failed

+0600, Alex Kuleshov wrote: i just got git from master (f6f61cbbad0611e03b712cc354f1665b5d7b087e), built and installed it successfully, now i'm running make test and got following error: *** t9902-completion.sh *** t9902-completion.sh: 118: /home/shk/dev/git/t/../contrib/completion/git

Re: t9902-completion.sh failed

ah, i catched the problem, I launched make test with sudo and now all tests passed successfully. Jeff King p...@peff.net @ 2014-11-13 17:24 ALMT: On Thu, Nov 13, 2014 at 04:59:12PM +0600, Alex Kuleshov wrote: i just got git from master (f6f61cbbad0611e03b712cc354f1665b5d7b087e), built

Re: [PATCH] Improve English grammar

I see it's been accepted now. Thank you! -Alex -- 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

[PATCH] Improve English grammar

Signed-off-by: Alex Henrie alexhenri...@gmail.com --- builtin/commit.c | 2 +- builtin/ls-files.c | 2 +- builtin/merge.c| 4 ++-- builtin/notes.c| 2 +- builtin/rm.c | 2 +- git-bisect.sh | 4 ++-- git-stash.sh | 2 +- git.c | 2 +- 8 files changed, 10

Cannot run cmd command lines from GIT bash

dir command, but all it does is invoke cmd.exe   interactively Alex Dickson, IESD, Mentor Graphics, Newbury, UK. phone:+44 1635 811429,    fax:+44 1635 810102 mailto:alex_dick...@mentor.com, http://www.mentor.com -- To unsubscribe from this list: send the line unsubscribe git in the body

RE: Cannot run cmd command lines from GIT bash

Thanks for your reply, I hadn't known that msys did translation of parameters with /. Doubling these up does make the commands work, but doesn’t explain why they used to work and now don't :( Alex Dickson, IESD, Mentor Graphics, Newbury, UK. phone:+44 1635 811429,fax:+44 1635 810102

Re: cherry picking and merge

feature, but the default system does not seem so onerous. Alex -- 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

Re: Race condition in git push --mirror can cause silent ref rewinding

On 07/02/2014 07:10 PM, Alex Vandiver wrote: On 07/02/2014 06:20 PM, Junio C Hamano wrote: Alex Vandiver a...@chmrr.net writes: [remote github] url = g...@github.com:bestpractical/rt.git fetch = +refs/*:refs/* mirror = yes git push github master^:master must

Race condition in git push --mirror can cause silent ref rewinding

mail goes out, etc 3. User A's push completes, updates tracking branch to value at (1). Needless to say, silently losing commits which appeared for all purposes to be pushed successfully (neither User A nor User B sees anything out of the ordinary) is extremely troubling. - Alex

Re: Race condition in git push --mirror can cause silent ref rewinding

On 07/02/2014 06:20 PM, Junio C Hamano wrote: Alex Vandiver a...@chmrr.net writes: [remote github] url = g...@github.com:bestpractical/rt.git fetch = +refs/*:refs/* mirror = yes git push github master^:master must stay a usable way to update the published

Re: gitignore vs. exclude vs assume-unchanged?

a speaker is talking about without having to doublecheck and ask if by git-ignore, the speaker really meant git ignore or dot-gitignore. Thanks, Alex -- 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

Re: What's cooking in git.git (Apr 2014, #08; Fri, 25)

On Fri, 2014-04-25 at 20:36 -0500, Felipe Contreras wrote: Jeff King wrote: If you are waiting on me, I do not have much else to say on this topic. @{publish} as specified by Felipe is not useful to me, and I would continue to pursue @{push} separately as the remote-tracking branch of

Re: gitignore vs. exclude vs assume-unchanged?

be clearer. thanks again Alex -- 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

gitignore vs. exclude vs assume-unchanged?

Any clarification on the differences much appreciated: http://stackoverflow.com/questions/23097368/git-ignore-vs-exclude-vs-assume-unchanged/23097509 -- 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

Re: gitignore vs. exclude vs assume-unchanged?

On 2014-04-16 10:51, Junio C Hamano wrote: a...@bellandwhistle.net writes: Any clarification on the differences much appreciated: http://stackoverflow.com/questions/23097368/git-ignore-vs-exclude-vs-assume-unchanged/23097509 Please don't force people to refer to external site. The

Bug: Branch rename breaks local downstream branches

When tracking a local branch, renaming the tracked branch will not update the downstream branch. See transcript: avallee@gust:/tmp/repo (master)$ git co -b foo Switched to branch 'foo' avallee@gust:/tmp/repo (foo)$ git co -b bar --track Branch bar set up to track local branch

Fwd: Runaway git remote if group definition contains a remote by the same name

FWIW, the issue is still present. -- Forwarded message -- From: Alex Riesen raa.l...@gmail.com Date: Wed, Nov 17, 2010 at 6:10 PM Subject: Runaway git remote if group definition contains a remote by the same name To: Git Mailing List git@vger.kernel.org Hi, it is also a way

Re: nd/magic-pathspec exposes breakage in git-add--interactive on Windows

On Thu, Aug 29, 2013 at 8:54 AM, Johannes Sixt j.s...@viscovery.net wrote: It looks like on Windows we disallow arguments that contain double-quote, colon, or asterisk, and otherwise wrap arguments in double-quotes if they contain space. Then pass them through qx{}, which I can only guess what

Re: Poor performance of git describe in big repos

On 31 May 2013 10:57, Alex Bennée kernel-hac...@bennee.com wrote: On 31 May 2013 09:46, Thomas Rast tr...@inf.ethz.ch wrote: So that deleted all unannotated tags pointing at commits, and then it was fast. Curious. However, if that turns out to be the culprit, it's not fixable currently[1

Re: Poor performance of git describe in big repos

On 30 May 2013 20:30, John Keeping j...@keeping.me.uk wrote: On Thu, May 30, 2013 at 06:21:55PM +0200, Thomas Rast wrote: Alex Bennée kernel-hac...@bennee.com writes: On 30 May 2013 16:33, Thomas Rast tr...@inf.ethz.ch wrote: Alex Bennée kernel-hac...@bennee.com writes: snip

Re: Poor performance of git describe in big repos

On 31 May 2013 09:24, Thomas Rast tr...@inf.ethz.ch wrote: Alex Bennée kernel-hac...@bennee.com writes: On 30 May 2013 20:30, John Keeping j...@keeping.me.uk wrote: On Thu, May 30, 2013 at 06:21:55PM +0200, Thomas Rast wrote: Alex Bennée kernel-hac...@bennee.com writes: On 30 May 2013 16:33

<    1   2   3   >