[PATCH v3 1/4] git-credential-store: support multiple credential files

Previously, git-credential-store only supported storing credentials in a single file: ~/.git-credentials. In order to support the XDG base directory specification[1], git-credential-store needs to be able to lookup and erase credentials from multiple files, as well as to pick the appropriate file t

[PATCH v3 4/4] t0302: test credential-store support for XDG_CONFIG_HOME

t0302 now tests git-credential-store's support for the XDG user-specific configuration file $XDG_CONFIG_HOME/git/credentials. Specifically: * Ensure that the XDG file is strictly opt-in. It should not be created by git at all times if it does not exist. * On the flip side, if the XDG file exist

[PATCH v3 0/4] git-credential-store: XDG user-specific config file support

The previous patch series can be found at [1]. [1] http://thread.gmane.org/gmane.comp.version-control.git/265042 The changes for "git-credential-store: support multiple credential files" are as follows: * store_credential(), instead of taking an index to the string_list for the default filename,

[PATCH v3 3/4] docs/git-credential-store: document XDG file and precedence

git-credential-store now supports an additional default credential file at $XDG_CONFIG_HOME/git/credentials. However, ~/.git-credentials takes precedence over it for backwards compatibility. To make the precedence ordering explicit, add a new section FILES that lists out the credential file paths i

[PATCH v3 2/4] git-credential-store: support XDG_CONFIG_HOME

Add $XDG_CONFIG_HOME/git/credentials to the default credential search path of git-credential-store. This allows git-credential-store to support user-specific configuration files in accordance with the XDG base directory specification[1]. [1] http://standards.freedesktop.org/basedir-spec/basedir-sp

Re: git commit --amend safety check?

On Tue, Mar 10, 2015 at 11:00 PM, Shawn Pearce wrote: > > OK, replace that Gerrit-specific push syntax with: > > git send-email > > :) Heh don't be too defensive; I was merely pulling your leg. >> ... But I am not sure what the definition of >> unusual should be. In a non-Gerrit central repos

Re: git commit --amend safety check?

On Tue, Mar 10, 2015 at 10:11 PM, Junio C Hamano wrote: > Shawn Pearce writes: > >> We keep seeing reports of Gerrit Code Review users who incorrectly do >> something like: >> >> git clone URL foo >> cd foo >> git commit --amend -m "My first change!" -a >> git push URL HEAD:refs/for/maste

Re: Surprising interaction of "binary" and "eol" gitattributes

On 03/10/2015 11:54 PM, Junio C Hamano wrote: Michael Haggerty writes: Well, that's true, but the "eol" attribute can regain its effect if "binary" is followed by "text" or "text=auto". So I guess the simplest question is as follows. Suppose I have the following .gitattributes: a.foo eol

Best Way to Play iTunes Movies on Galaxy Tab Pro 12.2

Best Way to Play iTunes Movies on Galaxy Tab Pro 12.2 If you want to put your own movies purchased from iTunes store on Samsung Galaxy Tab Pro 12.2 tablet, you got the right way! How to convert & put iTunes movies/songs onto Galaxy Tab Pro 12.2

Re: git commit --amend safety check?

Shawn Pearce writes: > We keep seeing reports of Gerrit Code Review users who incorrectly do > something like: > > git clone URL foo > cd foo > git commit --amend -m "My first change!" -a > git push URL HEAD:refs/for/master > > Step #3 is where they get into trouble. They just amended the

git commit --amend safety check?

We keep seeing reports of Gerrit Code Review users who incorrectly do something like: git clone URL foo cd foo git commit --amend -m "My first change!" -a git push URL HEAD:refs/for/master Step #3 is where they get into trouble. They just amended the published tip commit and pushed it bac

[ANNOUNCE] tig-2.1

I just released version 2.1 of Tig which brings a lot of improvements to speed up usage in large repositories such as the Linux kernel repo (see improvements related to #310, #324, #350, and #368). Else this release brings minor improvements across the board plus a fair amount of bug fixes. See bel

Re: Promoting Git developers

Duy Nguyen writes: > ... We may want to acknowledge review efforts as well, by > grepping Helped-by:, Reviewed-by:... Agreed. Something along the lines of $ git shortlog --no-merges -s -n -t Helped-by -t Reviewed-by v2.3.0.. 6 4 0 Michael Haggerty 3 0 1 Jeff King

Convert MKV with DTS to AC3 to Chromecast for playback

Convert MKV with DTS to AC3 to Chromecast for playback Here is a step by step guide to convert MKV with DTS-HD Master Audio to AC3 5.1 for playing on Google Chromecast on Windows and Mac. Question: /I am trying to play an MKV file which is encoded with DTS on ChromeCast via DSVideo. DS Video in

Re: [PATCH 2/3] bundle.c: fix memory leak

Stefan Beller writes: > There was one continue statement without an accompanying `free(ref)`. > Instead of adding that, replace all the free&&continue with a goto > just after writing the refs, where we'd do the free anyway and then > reloop. > > Signed-off-by: Stefan Beller > --- > bundle.c |

Re: [PATCH 3/3] builtin/help.c: fix memory leak

Stefan Beller writes: >> Hmph, does this memory belong to us, or are we peeking into the >> cached data in the config cache layer? > > So alias_lookup(..) is a wrapper around git_config_string essentially > (some more git_config_functions are involved, but we eventually reach > git_config_string

Expressing git in form of Mathematics

Hello Everyone, I am glad to be here and would be even more happier if I am able to do the work that I have undertaken, that is representation of git using mathematics. Even I have taken up this as my final year project, currently I am student of Applied Mathematics. I am doing this because I

[PATCH v4/GSoC/MICRO] revision: forbid combining --graph and --no-walk

Because "--graph" is about connected history while --no-walk is about discrete points, it does not make sense to allow giving these two options at the same time. [1] This change makes a few calls to "show --graph" fail in t4052, but asking to show one commit with graph is a nonsensical thing to do

Re: [PATCH v2 00/10] Use a structure for object IDs.

On Mar 7, 2015, at 15:23, brian m. carlson wrote: This is a patch series to convert some of the relevant uses of unsigned char [20] to struct object_id. brian m. carlson (10): All patches applied for me (to master) and all tests pass. Tested-by: Kyle J. McKay Define a structure for obje

Re: Promoting Git developers

"Jason St. John" writes: > In the Git release notes for something like "git foo > learned a new option --bar", a simple "(Thanks|Kudos) to John Smith" > at the end of each bullet point may be a good way to recognize > developers in a concise manner without needing to dig through the > output of "

Re: Promoting Git developers

On Wed, Mar 11, 2015 at 8:04 AM, Jason St. John wrote: > Or if that would make the release notes too cumbersome to review, what > about using systemd's method? systemd's release notes include a > "contributions from" section at the very end that lists everyone with > a patch included in the releas

Re: Promoting Git developers

On Tue, Mar 10, 2015 at 1:23 PM, Junio C Hamano wrote: > Christian Couder writes: > >> I don't want to write again about each of these points now. I am more >> interested in discussing a good strategy to try to revert the sad >> trend of Git developers being promoted less and less, because I thin

[PATCH 2/3] bundle.c: fix memory leak

There was one continue statement without an accompanying `free(ref)`. Instead of adding that, replace all the free&&continue with a goto just after writing the refs, where we'd do the free anyway and then reloop. Signed-off-by: Stefan Beller --- bundle.c | 11 +-- 1 file changed, 5 inser

Re: [PATCH 3/3] builtin/help.c: fix memory leak

On Tue, Mar 10, 2015 at 3:43 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Signed-off-by: Stefan Beller >> --- >> builtin/help.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/builtin/help.c b/builtin/help.c >> index 6133fe4..a1f5a0a 100644 >> --- a/built

Re: Clarification required for microproject "Add configuration options for some commonly used command-line options"

Koosha Khajehmoogahi writes: > Does this microproject require the feature to be a generic one for every > possible command or should it be limited to some particular commands? The Micro is written lazily so that by writing that entry once, it can tell many students to work on many different Git

Re: A branch question

Junio C Hamano writes: > 2. If you want to only correct what is shown at origin to the other > people, then you do not have to update your local repository. > > $ git push origin version_1.0 v1.0 > $ git push origin version_1.1 v1.1 Colons are missing from this one. git pus

Clarification required for microproject "Add configuration options for some commonly used command-line options"

Does this microproject require the feature to be a generic one for every possible command or should it be limited to some particular commands? -- 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.

Re: [PATCH] config.txt: stick to CamelCase naming convention

Eric Sunshine writes: >> @@ -2308,14 +2308,14 @@ sendemail.identity:: >> See linkgit:git-send-email[1] for description. Note that this >> setting is not subject to the 'identity' mechanism. >> >> -sendemail.smtpssl (deprecated):: >> +sendemail.smtpSSL (deprecated):: > > Here, "SS

Re: [PATCH 2/3] bundle.c: fix memory leak

Stefan Beller writes: > On Tue, Mar 10, 2015 at 3:40 PM, Junio C Hamano wrote: >> Stefan Beller writes: >> >>> The continue statements nearby also have an accompanying free(ref); >>> >>> Signed-off-by: Stefan Beller >>> --- >> >> I wonder what happens when dwim_ref() returned 2 or more, though

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

Kevin Daudt writes: > git log --bisect seems to do something different then git rev-list > --bisect > > From git-log(1): > > Pretend as if the bad bisection ref refs/bisect/bad was listed and > as if it was followed by --not and the good bisection refs > refs/bisect/good-* on the comm

Re: [PATCH 2/3] bundle.c: fix memory leak

On Tue, Mar 10, 2015 at 3:40 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> The continue statements nearby also have an accompanying free(ref); >> >> Signed-off-by: Stefan Beller >> --- > > I wonder what happens when dwim_ref() returned 2 or more, though. That should also be fixed I gue

Re: [PATCH] send-email: Add CCs from additional commit tags

On Fri, Mar 6, 2015 at 4:59 PM, Soren Brinkmann wrote: > Add email addresses from additional commonly used tags to the CC-list of > patches. Additional tags are: > - Acked-by > - Reviewed-by > - Tested-by > - Reported-by > - Reviewed-and-tested-by > > --suppress-cc=ack suppresses these additi

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

On Tue, Mar 10, 2015 at 03:09:54PM -0700, Junio C Hamano wrote: > Kevin Daudt writes: > > > rev-list --bisect is used by git bisect, but never together with > > --first-parent. Because rev-list --bisect together with --first-parent > > is not handled currently, and even leads to segfaults, refuse

Re: Surprising interaction of "binary" and "eol" gitattributes

Michael Haggerty writes: > Well, that's true, but the "eol" attribute can regain its effect if > "binary" is followed by "text" or "text=auto". So I guess the simplest > question is as follows. Suppose I have the following .gitattributes: > > a.foo eol=crlf > a.foo binary > a.foo text

Re: [PATCH 3/3] builtin/help.c: fix memory leak

Stefan Beller writes: > Signed-off-by: Stefan Beller > --- > builtin/help.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/builtin/help.c b/builtin/help.c > index 6133fe4..a1f5a0a 100644 > --- a/builtin/help.c > +++ b/builtin/help.c > @@ -456,7 +456,7 @@ static void

Re: [PATCH 2/3] bundle.c: fix memory leak

Stefan Beller writes: > The continue statements nearby also have an accompanying free(ref); > > Signed-off-by: Stefan Beller > --- I wonder what happens when dwim_ref() returned 2 or more, though. > bundle.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/bundle.c b/bundle.c > index

Re: [PATCH 1/3] connect.c: Fix memory leak

Stefan Beller writes: > Signed-off-by: Stefan Beller > --- > connect.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/connect.c b/connect.c > index ce0e121..6090211 100644 > --- a/connect.c > +++ b/connect.c > @@ -739,6 +739,7 @@ struct child_process *git_connect(int fd[2], const char

Re: [PATCH v3] remote-curl: fall back to Basic auth if Negotiate fails

On Tue, Mar 10, 2015 at 06:05:46PM +, Dan Langille (dalangil) wrote: We have made progress I think. With stock git: tl;dr: 1 - with a ticket, you get prompted, but hitting ENTER succeeds. 2 - without a ticket, nothing works With patched git: tl;dr: 1 - with a ticket,entering cr

Re: Surprising interaction of "binary" and "eol" gitattributes

On 03/10/2015 09:26 PM, Torsten Bögershausen wrote: > On 10.03.15 20:25, Michael Haggerty wrote: >> [...] >> I'm still trying to infer the spirit of the current behavior, so caveats >> here. >> >> This comes from a real-life scenario where a user, somewhere early in >> .gitattributes, had >> >>

Re: Surprising interaction of "binary" and "eol" gitattributes

On 03/10/2015 09:01 PM, Junio C Hamano wrote: > Michael Haggerty writes: >> [...] >> It seems to me that setting "text=auto" should mean that Git uses its >> heuristic to guess whether a particular file is text or not, and then >> treats the file as if it had "text" or "-text" set. If the latter,

[PATCH v3 1/2] reset: enable '-' short-hand for previous branch

git reset -' will reset to the previous branch. It will behave similar to @{-1} except when a file named '@{-1}' is present. To refer to a file named '-', use ./- or the -- flag. Helped-by: Junio C Hamano Helped-by: Eric Sunshine Helped-by: Matthieu Moy Signed-off-by: Sudhanshu Shekhar --- Eri

[PATCH v3 2/2] t7102: add 'reset -' tests

Add following test cases: 1) Confirm error message when git reset is used with no previous branch 2) Confirm git reset - works like git reset @{-1} 3) Confirm "-" is always treated as a commit unless the -- file option is specified 4) Confirm "git reset -" works normally even when a file named @{

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

Kevin Daudt writes: > rev-list --bisect is used by git bisect, but never together with > --first-parent. Because rev-list --bisect together with --first-parent > is not handled currently, and even leads to segfaults, refuse to use > both options together. > > Suggested-by: Junio C. Hamano > Help

[PATCH v3 1/2] reset: enable '-' short-hand for previous branch

git reset -' will reset to the previous branch. It will behave similar to @{-1} except when a file named '@{-1}' is present. To refer to a file named '-', use ./- or the -- flag. Helped-by: Junio C Hamano Helped-by: Eric Sunshine Helped-by: Matthieu Moy Signed-off-by: Sudhanshu Shekhar --- Eri

Re: [PATCH v3/GSoC/MICRO] revision: forbid combining --graph and --no-walk

Dongcan Jiang writes: > Because "--graph" is about connected history while --no-walk > is about discrete points, it does not make sense to allow > giving these two options at the same time. [1] > > This change allows git-show to have such options' combination > as a special case, because git-show

Re: A branch question

"J. R. Westmoreland" writes: > I have a number of repos that were converted from svn to git. After > the conversion the branches that contained each release were named > something like “branches/version_”. We want to > modify the repo so the branches are named something like > “release/”. > > I c

A branch question

hi everyone I have found a solution which may not be the best so I’m asking it here to see if I get a different solution from the wizards group. :) I have a number of repos that were converted from svn to git. After the conversion the branches that contained each release were named something li

Re: [PATCH] config.txt: stick to CamelCase naming convention

On Tue, Mar 10, 2015 at 6:39 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/Documentation/config.txt b/Documentation/config.txt > index 1530255..b4cc577 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -257,20 +257,20 @@ cor

[JFF] "-" and "@{-1}" on various programs

JFF stands for just for fun. This is not meant to give out a model answer and is known to be incomplete, but I was wondering if it would be a better direction to allow "-" as a stand-in for "@{-1}" everywhere we allow a branch name, losing workarounds at the surface level we have for checkout, mer

Re: Surprising interaction of "binary" and "eol" gitattributes

Michael Haggerty writes: > On 03/06/2015 10:30 PM, Torsten Bögershausen wrote: >> >>> Oops, I misunderstood an internal bug report. In seems that it is the >>> following scenario that is incorrect: >>> >>> *.png text=auto eol=crlf >> Hm, I don't know if we support this combination at all. >

Connecting git with Mathematics

Hello Everyone, I am glad to be here and would be even more happier if I am able to do the work that I have undertaken, that is representation of git using mathematics. Even I have taken up this as my final year project, currently I am student of Applied Ma

Re: [PATCH] protocol upload-pack-v2

On Mar 9, 2015, at 18:38, Duy Nguyen wrote: A minor point on capability negotiation. I remember why I passed capabilities via command line instead of this proposal. With this proposal, daemon.c does not recognize "i18n" capability and cannot switch to the correct language before it reports an err

Re: Surprising interaction of "binary" and "eol" gitattributes

On 03/06/2015 10:30 PM, Torsten Bögershausen wrote: > >> Oops, I misunderstood an internal bug report. In seems that it is the >> following scenario that is incorrect: >> >> *.png text=auto eol=crlf > Hm, I don't know if we support this combination at all. The user can specify this combinatio

Re: [PATCH v3 1/2] reset: enable '-' short-hand for previous branch

On Tue, Mar 10, 2015 at 6:52 AM, Sudhanshu Shekhar wrote: > 'git reset -' will reset to the previous branch. It will behave similar > to @{-1} except when a file named '@{-1}' is present. To refer to a file > named '-', use ./- or the -- flag. > > Helped-by: Junio C Hamano > Helped-by: Eric Sunsh

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 : > 2015-02-16 16:27 GMT-07:00 Alex Henrie : >> 2015-02-09 14:55 GMT-07:00 Junio C Hamano : >>> >>> Alex Henrie writes: >>> >>> > This is just a friendly reminder that this patch has been sitting in >>> > the mailing list archives for a couple of weeks, and i

Re: [PATCH v3 2/2] Added tests for reset -

On Tue, Mar 10, 2015 at 6:52 AM, Sudhanshu Shekhar wrote: > Added tests for reset - Mention the area of the project you are changing, followed by a colon, followed by a short summary of the change. Drop capitalization. Write in imperative mood. t7102: add 'reset -' tests > Added the followi

Re: [PATCH v3 2/2] Added tests for reset -

Hi, On Tue, Mar 10, 2015 at 6:56 PM, Matthieu Moy wrote: > Sudhanshu Shekhar writes: > >> +test_expect_success 'reset - while having file named - and no previous >> branch' ' > > I like having the expected behavior in the test name too. e.g. add > "fails" at the end of the sentence. > Sure. I w

Re: [PATCH 1/2] Adding - shorthand for @{-1} in RESET command

Eric Sunshine writes: >> @@ -226,7 +233,14 @@ static void parse_args(struct pathspec *pathspec, >> rev = *argv++; >> } else { >> /* Otherwise we treat this as a filename */ >> - verify_filename(prefix, argv[0],

Re: [PATCH 2/2] Added tests for git reset -

Eric Sunshine writes: >> +test_expect_success 'reset - with no @{-1}' ' >> + git init new --quiet && > > Why --quiet? Also, to make sure tests serve as good examples, tests should stick to "options first and then arguments", i.e. "git init --quiet new", if it passes options. -- To unsubscr

Re: [v2 PATCH 2/2] reset: add tests for git reset -

On Tue, Mar 10, 2015 at 11:38 AM, Sundararajan R wrote: > reset: add tests for git reset - Since this patch is changing the tests rather than 'reset' itself, you'd likely want to say: t7102: add 'reset -' tests > The failure case which occurs on teaching git is taught the '-' shorthand > is

Re: [v2 PATCH 1/2] reset: add '-' shorthand for '@{-1}'

On Tue, Mar 10, 2015 at 11:38 AM, Sundararajan R wrote: > Teaching reset the - shorthand involves checking if any file named '-' exists > because it then becomes ambiguous as to whether the user wants to reset the > file '-' or if he wants to reset the working tree to the previous branch. For cla

Re: Promoting Git developers

Christian Couder writes: > I don't want to write again about each of these points now. I am more > interested in discussing a good strategy to try to revert the sad > trend of Git developers being promoted less and less, because I think > that it is really very important. I would suspect that th

Re: [v2 PATCH 2/2] reset: add tests for git reset -

On 2015-03-10 16.38, Sundararajan R wrote: > Helped-by: Torsten Bögershausen There seems to be an issue that the mail is encoded from (what ? Latin-1) into UTF-8 2 times The easy solution is to remove the line, I'm OK with that, since a review-comment is not necessarily motivating a Helped-by,

[PATCH] config,completion: add color.status.unmerged

Reported-by: "Mladen B." Signed-off-by: Michael J Gruber --- Documentation/config.txt | 6 -- contrib/completion/git-completion.bash | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index a158e7f..bc22eee

[v2 PATCH 1/2] reset: add '-' shorthand for '@{-1}'

Teaching reset the - shorthand involves checking if any file named '-' exists because it then becomes ambiguous as to whether the user wants to reset the file '-' or if he wants to reset the working tree to the previous branch. check_filename() is used to perform this check. A similar ambiguity o

Re: [PATCH] config.txt: stick to CamelCase naming convention

On 10.03.15 11:39, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > .. while I'm looking at config.txt. I think this is the preferred naming > convention for config keys. I think the default is unix-like lowercase, this is what Git itself produces. (core.ignorecase, c

Re: [PATCH v2 4/4] t0302: test credential-store support for XDG_CONFIG_HOME

On Mon, Mar 9, 2015 at 8:36 PM, Matthieu Moy wrote: > Paul Tan writes: >> +' >> +test_expect_success 'xdg credentials file will not be created if it does >> not exist' ' > > We usually put a blank line between tests. Okay, will do that. >> +helper_test store > > That seems a bit "brute force"

[PATCHv2 0/2] log decorations for HEAD

So it didn't take too long to convince me after all :) Here comes Junio's version, preceded by a cleanup of the color setting and resetting for decorations. Junio C Hamano (1): log: decorate HEAD with branch name Michael J Gruber (1): log-tree: properly reset colors log-tree.c

[PATCHv2 2/2] log: decorate HEAD with branch name

From: Junio C Hamano Currently, log decorations do not indicate which branch is checked out and whether HEAD is detached. When branch foo is checked out, change the "HEAD, foo" part of the decorations to "HEAD -> foo". This serves to indicate both ref decorations (helped by the spacing) as well

[PATCHv2 1/2] log-tree: properly reset colors

Except for the separator, all output items reset the color immediately. Do the same for the separator. This affects only cases where setting color A does not override color B, such as when one is forground and one background. Signed-off-by: Michael J Gruber --- log-tree.c

Re: [PATCH v2 2/4] git-credential-store: support XDG_CONFIG_HOME

On Sun, Mar 8, 2015 at 3:58 PM, Paul Tan wrote: > remove_credential(&fns, &c); > else if (!strcmp(op, "store")) > - store_credential(&fns, &c, fns.nr - 1); > + store_credential(&fns, &c, 0); > else > ; /* Ignore unknown op

Re: [PATCH v3 2/2] Added tests for reset -

Sudhanshu Shekhar writes: > +test_expect_success 'reset - while having file named - and no previous > branch' ' I like having the expected behavior in the test name too. e.g. add "fails" at the end of the sentence. > +test_expect_success 'reset - in the presence of file named - with previous

Re: [PATCH v3 1/2] reset: enable '-' short-hand for previous branch

Sudhanshu Shekhar writes: > *rev_ret = rev; > - > if (read_cache() < 0) Please don't make whitespace-only changes like this in your patches. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message t

Missing slot "unmerged"

Hi, I noticed there is a missing named "unmerged" inside the "color.status." on the documentation page: http://git-scm.com/docs/git-config This color is used when "git status" command is performed during the conflict in the rebase process. M. -- To unsubscribe from this list: send the line "uns

Re: Promoting Git developers (was: Bashing freelancers)

On Mon, Mar 9, 2015 at 2:57 PM, Michael J Gruber wrote: > Christian Couder venit, vidit, dixit 07.03.2015 08:18: >> Hi, >> >> On Fri, Mar 6, 2015 at 6:41 PM, David Kastrup wrote: >> >>> At some point of time I think it may be worth reevaluating the toxic >>> atmosphere against freelancers doing G

Re: [PATCH 0/5] Retry if fdopen() fails due to ENOMEM

On 03/06/2015 06:08 AM, Torsten Bögershausen wrote: > On 03/05/2015 05:07 PM, Michael Haggerty wrote: >> One likely reason for fdopen() to fail is the lack of memory for >> allocating a FILE structure. When that happens, try freeing some >> memory and calling fdopen() again in the hope that it will

Re: [PATCH 0/5] Retry if fdopen() fails due to ENOMEM

On 03/05/2015 08:19 PM, Junio C Hamano wrote: > Michael Haggerty writes: > >> One likely reason for fdopen() to fail is the lack of memory for >> allocating a FILE structure. When that happens, try freeing some >> memory and calling fdopen() again in the hope that it will work the >> second time.

[PATCH v3 2/2] Added tests for reset -

Added the following test cases: 1) Confirm error message when git reset is used with no previous branch 2) Confirm git reset - works like git reset @{-1} 3) Confirm "-" is always treated as a commit unless the -- file option is specified 4) Confirm "git reset -" works normally e

[PATCH v3 1/2] reset: enable '-' short-hand for previous branch

'git reset -' will reset to the previous branch. It will behave similar to @{-1} except when a file named '@{-1}' is present. To refer to a file named '-', use ./- or the -- flag. Helped-by: Junio C Hamano Helped-by: Eric Sunshine Helped-by: Matthieu Moy Signed-off-by: Sudhanshu Shekhar --- Th

[PATCH] config.txt: stick to CamelCase naming convention

Signed-off-by: Nguyễn Thái Ngọc Duy --- .. while I'm looking at config.txt. I think this is the preferred naming convention for config keys. I may have missed some in this file but this is better than before already. Documentation/config.txt | 220 +++--

Re: [PATCH] log: decorate detached HEAD differently

Junio C Hamano venit, vidit, dixit 10.03.2015 03:03: > Michael J Gruber writes: > >> Junio C Hamano venit, vidit, dixit 06.03.2015 20:03: >>> Michael J Gruber writes: Note that now a checked branch is listed twice, once as target of the HEAD, once as branch: They are

[PATCH] config.txt: update versioncmp.prereleaseSuffix

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 69a7345..fe8705d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2527,8

I am sending you my new invitation for special session, workshops and invited papers

Dear Authors, We would like to invite you to organize a Special Session or a Workshop in CSCC 2015: Circuits, Systems, Communications and Computers www.cscc.co in conjuction with several parallel conferences of INASE.org We would like to invite you also to present an Invited Lecture (you know th

Re: Bug? git submodule add SSL certificate problem: unable to get local issuer certificate

Am 09.03.2015 um 20:43 schrieb Jeff King: On Thu, Mar 05, 2015 at 04:20:10PM +0100, Aschemann Gerd wrote: seems to be a bug: If adding a submodule from an https URL with a certificate issued by StartSSL (or even a private/self-signed one?) leads to the following error: $ git -c http.sslve

Re: [PATCH v2] t7510: do not fail when gpg warns about insecure memory

Kyle J. McKay venit, vidit, dixit 09.03.2015 21:03: > Depending on how gpg was built, it may issue the following > message to stderr when run: > > Warning: using insecure memory! > > When the test is collecting gpg output it is therefore not > enough to just match on a "gpg: " prefix it must al

Re: git-scm.com website

Scott Chacon venit, vidit, dixit 09.03.2015 18:14: > Hey, > > On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup wrote: >>> On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber >>> wrote: Since we're talking business: git-scm.com still looks a bit like a ProGit/Github promotion site. I don

Re: [PATCH] versionsort: support reorder prerelease suffixes

On Tue, Mar 10, 2015 at 3:52 AM, Junio C Hamano wrote: > Duy Nguyen writes: >> How about.. >> >> ".. "1.0-rc1" will appear before "1.0". This key can be specified >> multiple times, one for each suffix. The order of suffixes in the Minor bike-shedding: s/one for each suffix/once per suffix/ >>

Re: [PATCH] versionsort: support reorder prerelease suffixes

Duy Nguyen writes: > On Thu, Mar 5, 2015 at 8:28 AM, Junio C Hamano wrote: >> Junio C Hamano writes: >> +versionsort.prereleaseSuffix:: +When version sort is used in linkgit:git-tag[1], prerelease +tags (e.g. "1.0-rc1") may appear after the main release +"1.0". B

Re: [PATCH 2/2] Added tests for git reset -

On Mon, Mar 9, 2015 at 4:46 PM, Sundararajan R wrote: > As you had suggested @Junio, I have added the required tests. > Please let me know if there is something is I should add. > > Signed-off-by: Sundararajan R > Thanks-to: Junio C Hamano > --- > I have added 6 tests to check for the following c

Re: Promoting Git developers

Michael J Gruber writes: > I guess we have at least 3 kinds of people here: > > A) Paid to do Git development, at least as part of their job. > B) Freelancers who don't get paid directly for "doing git" but hope to > profit from their git efforts directly or indirectly. > C) Doing it in their fre

Re: [PATCH v2 1/2] Teach reset the same short-hand as checkout

Hi, On Tue, Mar 10, 2015 at 8:04 AM, Junio C Hamano wrote: > Sudhanshu Shekhar writes: > >> "-" now means the previous branch. >> >> Signed-off-by: Sudhanshu Shekhar >> Thanks-to: Eric Sunshine, Junio C Hamano, Matthieu Moy >> --- > > > These look unusual for a few reasons: your S-o-b should be