Re: [PATCH 4/4] mingw: skip some tests in t9115 due to file name issues

On 2016-03-22 23.57, Junio C Hamano wrote: > Dscho, I queued two out of these four, with a proposed fix-up patch > for each of them, on 'pu'; but I won't squash them together myself > without hearing from you as I do not test mingw or macosx. > > Thanks. the queued t9115 passes under Mac OS X

Re: [PATCH] submodule: Fix regression for deinit without submodules

Stefan Beller writes: > Per Cederqvist wrote: >> It used to be possible to run >> >>git submodule deinit -f . >> >> to remove any submodules, no matter how many submodules you had. That >> is no longer possible in projects that don't have any submodules at >> all. The

Re: [PATCH 2/2] created helper function for both winmerge and examdiff mergetools

Jacob Nisnevich writes: > diff --git a/mergetools/examdiff b/mergetools/examdiff > index 474fffe..8b66c17 100644 > --- a/mergetools/examdiff > +++ b/mergetools/examdiff > @@ -1,3 +1,5 @@ > +. mergetools_helpers > + The way dot-inclusion is done in existing

[PATCH 2/2] created helper function for both winmerge and examdiff mergetools

Signed-off-by: Jacob Nisnevich --- ...s-created-new-mergetool-file-for-ExamDiff.patch | 58 ++ mergetools/examdiff| 25 ++ mergetools/mergetools_helpers | 30 +++

[PATCH 0/2] Helper function for ExamDiff and Winmerge mergetools

I've been trying to implement a helper function for both Winmerge and ExamDiff as you requested, but for some reason including another shell script with . or source seems to fail on Windows in this case. I've attached the patches for the two commits I've made so far. Is there anything I'm doing

[PATCH 1/2] mergetools: created new mergetool file for ExamDiff

Signed-off-by: Jacob Nisnevich --- mergetools/examdiff | 37 + 1 file changed, 37 insertions(+) create mode 100644 mergetools/examdiff diff --git a/mergetools/examdiff b/mergetools/examdiff new file mode 100644 index

Re: [PATCH] git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS

On Tue, Mar 22, 2016 at 2:43 PM, Jonathan Nieder wrote: > Jeff King wrote[1]: > >> Subject: git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS >> >> The "git -c var=value" option stuffs the config value into >> $GIT_CONFIG_PARAMETERS, so that sub-processes can see

Re: [PATCH 2/4] Make t1300-repo-config resilient to being run via 'sh -x'

Junio C Hamano wrote: > Both sounds sensible. Should we squash this in, then? > > t/t1300-repo-config.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Jonathan Nieder Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in

[PATCH] submodule: Fix regression for deinit without submodules

Per Cederqvist wrote: > It used to be possible to run > >git submodule deinit -f . > > to remove any submodules, no matter how many submodules you had. That > is no longer possible in projects that don't have any submodules at > all. The command will fail with: > > error: pathspec '.'

Re: [PATCH 4/4] mingw: skip some tests in t9115 due to file name issues

Torsten Bögershausen writes: > On 2016-03-22 21.44, Junio C Hamano wrote: >> Torsten Bögershausen writes: >> >>> On 2016-03-22 18.43, Johannes Schindelin wrote: These two tests wanted to write file names which are incompatible with Windows' file naming

Re: [PATCH] submodule helper: accept '.' for repositories with no submodules

Stefan Beller writes: > So for now I would send the performance regressing flip of > IS_GITLINK and match_pathspec targeting 2.7 and then add a > --unmatch-ok switch for 2.8 and later? "git submodule $subcommand -- COPYIN\*" that detects that there is no submodule that match

Re: [PATCH 4/4] mingw: skip some tests in t9115 due to file name issues

On 2016-03-22 21.44, Junio C Hamano wrote: > Torsten Bögershausen writes: > >> On 2016-03-22 18.43, Johannes Schindelin wrote: >>> These two tests wanted to write file names which are incompatible with >>> Windows' file naming rules. >>> >>> Signed-off-by: Johannes Schindelin

Re: [RFC_PATCHv4 5/7] submodule update: respect submodule.actionOnLabel

Stefan Beller writes: > This change introduces the 'submodule.actionOnLabel' variable > in a repository configuration. Generally speaking 'submodule.actionOnLabel' > restricts the action of a command when no submodules are selected via the > command line explicitely to those

Re: git fails updating submodule only if --quiet is specified

On Tue, Mar 22, 2016 at 06:25:01PM -0400, Jeff King wrote: > I think you can simplify this quite a bit to just: > > git clone --quiet git://git.busybox.net/buildroot > > That breaks, but works without --quiet. Presumably the problem is on the > server side, as we see the remote end hang up

Re: [RFC_PATCHv4 1/7] git submodule: teach `add` to label submodules

Stefan Beller writes: > When adding new submodules, you can specify the > label(s) the submodule belongs to by giving one or more > --label arguments. This will record each label in the > .gitmodules file as a value of the key > "submodule.$NAME.label". Having an ability to

Re: [RFC_PATCHv4 3/7] submodule-config: add method to check for being labeled

Stefan Beller writes: > In later patches we need to tell if a submodule is labeled by > the given labels. > > Signed-off-by: Stefan Beller > --- Hmph, I would have expected that something like this would touch the module_list() implementation. Probably

Re: [RFC_PATCHv4 1/7] git submodule: teach `add` to label submodules

Stefan Beller writes: > When adding new submodules, you can specify the > label(s) the submodule belongs to by giving one or more > --label arguments. This will record each label in the > .gitmodules file as a value of the key > "submodule.$NAME.label". Can you define the

Re: git fails updating submodule only if --quiet is specified

On Tue, Mar 22, 2016 at 02:38:34PM -0700, Stefan Beller wrote: > On Tue, Mar 22, 2016 at 11:22 AM, Stefan Beller wrote: > > However lookingat your logs, I would suspect it is an error in git > > clone instead, as that is the > > last command which has the --quiet flag passed

Re: git-apply does not work in a sub-directory of a Git repository

On Tue, Mar 22, 2016 at 5:10 AM, Mehul Jain wrote: > Hello everyone, > > Recently while using git-apply, I observed that if git-apply is used in a > sub-directory of a Git repository then it silently dies without doing > anything. > > Here's what I did > > ~ $mkdir

Re: [PATCH 2/3] builtin/apply: make gitdiff_verify_name() return void

On Tue, Mar 22, 2016 at 10:25 PM, Junio C Hamano wrote: > Christian Couder writes: > >> As the value returned by gitdiff_verify_name() is put into the >> same variable that is passed as a parameter to this function, >> it is simpler to pass the

Re: [PATCH] submodule helper: accept '.' for repositories with no submodules

On Tue, Mar 22, 2016 at 3:04 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> I was under the impression that we do not want to have this bugfix >> (at least long term) and then I tried to come up with an idea, >> which is both: >> * correct in this

Re: [PATCH] submodule helper: accept '.' for repositories with no submodules

Stefan Beller writes: > I was under the impression that we do not want to have this bugfix > (at least long term) and then I tried to come up with an idea, > which is both: > * correct in this case > * and catches the git submodule init -- 'COPYIN*' case as failure

Re: git fails updating submodule only if --quiet is specified

On Tue, Mar 22, 2016 at 2:59 PM, Marcus T wrote: > I should mention that I first ran into the issue in Git 2.5.0. I updated to > 2.7.4 in the hopes that it had been fixed already. > Does that ring a bell for anyone? -- To unsubscribe from this list: send the line

Re: [PATCH] submodule helper: accept '.' for repositories with no submodules

On Tue, Mar 22, 2016 at 2:38 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> I do not think that buys us much. You have already shown how to >>> implement "filter first and then pathspec match" if a caller >>> wants to (which turned out to be a

Re: git fails updating submodule only if --quiet is specified

On Tue, Mar 22, 2016 at 2:38 PM, Stefan Beller wrote: > On Tue, Mar 22, 2016 at 11:22 AM, Stefan Beller wrote: >> However lookingat your logs, I would suspect it is an error in git >> clone instead, as that is the >> last command which has the --quiet flag

Re: [PATCH] git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS

Jeff King wrote[1]: > Subject: git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS > > The "git -c var=value" option stuffs the config value into > $GIT_CONFIG_PARAMETERS, so that sub-processes can see it. > When the config is later read via git_config() or similar, > we parse it back

Re: git fails updating submodule only if --quiet is specified

On Tue, Mar 22, 2016 at 11:22 AM, Stefan Beller wrote: > However lookingat your logs, I would suspect it is an error in git > clone instead, as that is the > last command which has the --quiet flag passed through the stack. git clone --no-checkout --quiet --separate-git-dir

Re: [PATCH] submodule helper: accept '.' for repositories with no submodules

Stefan Beller writes: >> I do not think that buys us much. You have already shown how to >> implement "filter first and then pathspec match" if a caller >> wants to (which turned out to be a regression in this case, but >> that is besides the point). > > And by including

Re: [PATCH 3/3] builtin/apply: simplify gitdiff_{old,new}name()

Christian Couder writes: > After the previous simplifications, it is easy to see that > there is no need to free the original string passed to > gitdiff_verify_name(), because this string can be changed > only when it is NULL. > > Signed-off-by: Christian Couder

Increase Income by Wrapping Your Car

Hello, We are currently seeking to employ individual’s world wide. How would you like to make money by simply driving your car advertising for PEPSI. How it works? Here’s the basic premise of the "paid to drive" concept: PEPSI seeks people -- regular citizens,professional drivers to go about

Re: [PATCH 2/3] builtin/apply: make gitdiff_verify_name() return void

Christian Couder writes: > As the value returned by gitdiff_verify_name() is put into the > same variable that is passed as a parameter to this function, > it is simpler to pass the address of the variable and have > gitdiff_verify_name() change the variable itself. >

Re: [PATCH 1/3] builtin/apply: get rid of useless 'name' variable

Christian Couder writes: > While at it put an 'else' on the same line as the previous '}'. > > Signed-off-by: Christian Couder > --- > builtin/apply.c | 13 + > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git

Re: [PATCH] submodule helper: accept '.' for repositories with no submodules

On Tue, Mar 22, 2016 at 1:06 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Maybe we can also special case the "force" argument only here for >> Cedars use case. ("git submodule deinit ." complains because >> there are no further submodules, but -f

[PATCH 1/3] builtin/apply: get rid of useless 'name' variable

While at it put an 'else' on the same line as the previous '}'. Signed-off-by: Christian Couder --- builtin/apply.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 42c610e..465f954 100644 ---

[PATCH 3/3] builtin/apply: simplify gitdiff_{old,new}name()

After the previous simplifications, it is easy to see that there is no need to free the original string passed to gitdiff_verify_name(), because this string can be changed only when it is NULL. Signed-off-by: Christian Couder --- builtin/apply.c | 6 -- 1 file

[PATCH 2/3] builtin/apply: make gitdiff_verify_name() return void

As the value returned by gitdiff_verify_name() is put into the same variable that is passed as a parameter to this function, it is simpler to pass the address of the variable and have gitdiff_verify_name() change the variable itself. Signed-off-by: Christian Couder ---

[PATCH 0/3] builtin/apply: simplify some gitdiff_* functions

While working on libifying "git apply" it appeared that some gitdiff_* functions are unnecessarily complex. Christian Couder (3): builtin/apply: get rid of useless 'name' variable builtin/apply: make gitdiff_verify_name() return void builtin/apply: simplify gitdiff_{old,new}name()

Re: [PATCH 4/4] mingw: skip some tests in t9115 due to file name issues

Torsten Bögershausen writes: > On 2016-03-22 18.43, Johannes Schindelin wrote: >> These two tests wanted to write file names which are incompatible with >> Windows' file naming rules. >> >> Signed-off-by: Johannes Schindelin > > Is there a chance to

[PATCH v6] Add the option to force sign annotated tags

The `tag.forcesignannotated` config option allows to sign annotated tags automatically. `--annotate` command line option disable configuration `tag.forcesignannotated`. Signed-off-by: Laurent Arnoud --- Documentation/config.txt | 5 + builtin/tag.c| 20

Re: [PATCH 2/4] Make t1300-repo-config resilient to being run via 'sh -x'

Jonathan Nieder writes: > Johannes Schindelin wrote: > >> --- a/t/t1300-repo-config.sh >> +++ b/t/t1300-repo-config.sh >> @@ -699,17 +699,13 @@ test_expect_success 'invalid unit' ' >> echo 1auto >expect && >> git config aninvalid.unit >actual && >> test_cmp

Re: [PATCH] git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS

Jeff King writes: > Obviously another option would be to make the parsing side more liberal > (which has the added effect that if anybody _else_ ever wants to > generate $GIT_CONFIG_PARAMETERS, they will not get annoyed). But I took > this route for now because it's the simplest

Re: [PATCH v5] Add the option to force sign annotated tags

On Tue, Mar 22, 2016 at 12:48:50PM -0700, Junio C Hamano wrote: > Laurent Arnoud writes: > > > The `tag.forcesignannotated` config option allows to sign > > annotated tags automatically. > > It looks like it does a lot more than that to me, though. > > > @@ -327,7 +333,7 @@

Re: [PATCH] submodule helper: accept '.' for repositories with no submodules

Stefan Beller writes: > Maybe we can also special case the "force" argument only here for > Cedars use case. ("git submodule deinit ." complains because > there are no further submodules, but -f solves the complaint?) I think that would have been the most sensible thing to

Condominium Owners List

Hi, I'm Emily Would you be interested in reaching out to "Condominium Owners Email List" with opt-in and licensed to be sold? We also have data for Building Investors, Home Owners, Mortgage, Estate Planners and many more… Each record in the list contains Contact Name( First, Middle, Last

[PATCH] git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS

On Tue, Mar 22, 2016 at 03:23:09PM -0400, Jeff King wrote: > On Tue, Mar 22, 2016 at 11:56:28AM -0700, Jonathan Nieder wrote: > > > This is failing for me when I use "git submodule add" with a remote > > helper I whitelisted with GIT_ALLOW_PROTOCOL, with current "next": > > > > $

Re: [PATCH v5] Add the option to force sign annotated tags

Laurent Arnoud writes: > The `tag.forcesignannotated` config option allows to sign > annotated tags automatically. It looks like it does a lot more than that to me, though. > @@ -327,7 +333,7 @@ int cmd_tag(int argc, const char **argv, const char > *prefix) > char

[PATCH v5] Add the option to force sign annotated tags

The `tag.forcesignannotated` config option allows to sign annotated tags automatically. `--annotate` command line option disable configuration `tag.forcesignannotated`. Signed-off-by: Laurent Arnoud --- Documentation/config.txt | 5 + builtin/tag.c| 22

Re: [PATCH] submodule helper: accept '.' for repositories with no submodules

On Tue, Mar 22, 2016 at 11:53 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> In 74703a1e4d (2015-09-02, submodule: rewrite `module_list` shell >> function in C), "submodule deinit ." was broken. >> >> The original module_list accepted '.' as a

Re: [RFC/GSoC] Introduction

From: "Philip Oakley" Sent: March 14, 2016 9:08 PM From: "Lars Schneider" On 14 Mar 2016, at 07:57, Junio C Hamano wrote: Lars Schneider writes: I thought a while about this requirement and I

Re: When does git check for branch-X being uptodate with origin/branch-X?

From: "Thomas Adam" Sent: Monday, March 21, 2016 8:43 PM On 21 March 2016 at 20:28, Jeff King wrote: We never contact other repositories unless explicitly asked to by fetch, pull, push, etc. If you want to have the most up-to-date value without merging,

Re: [PATCH v6 7/7] git: submodule honor -c credential.* from command line

On Tue, Mar 22, 2016 at 11:56:28AM -0700, Jonathan Nieder wrote: > This is failing for me when I use "git submodule add" with a remote > helper I whitelisted with GIT_ALLOW_PROTOCOL, with current "next": > > $ bin-wrappers/git submodule add >

Re: [PATCH] submodule helper: accept '.' for repositories with no submodules

Stefan Beller writes: > In 74703a1e4d (2015-09-02, submodule: rewrite `module_list` shell > function in C), "submodule deinit ." was broken. > > The original module_list accepted '.' as a pathspec just fine, as it > was using > > git ls-files -z --error-unmatch --stage --

Re: [PATCH v2] branch -D: allow - as abbreviation of '@{-1}'

On Tue, Mar 22, 2016 at 1:12 PM, Junio C Hamano wrote: > Junio C Hamano writes: >> I _think_ strbuf_branchname() leaves "@{-}" when you do not have >> enough branch switches in the reflog, so perhaps ... > > This is a tangent, but the value returned from

Re: [PATCH v6 7/7] git: submodule honor -c credential.* from command line

Hi, Jacob Keller wrote: > Due to the way that the git-submodule code works, it clears all local > git environment variables before entering submodules. This is normally > a good thing since we want to clear settings such as GIT_WORKTREE and > other variables which would affect the operation of

Re: [PATCH 4/4] mingw: skip some tests in t9115 due to file name issues

On 2016-03-22 18.43, Johannes Schindelin wrote: > These two tests wanted to write file names which are incompatible with > Windows' file naming rules. > > Signed-off-by: Johannes Schindelin Is there a chance to squeeze in a precondition for HFS under Mac OS ? >

Re: git fails updating submodule only if --quiet is specified

On Tue, Mar 22, 2016 at 8:51 AM, Marcus T wrote: git submodule was partially rewritten in v2.7 so I would assume that is some fallout from there. (passing the wrong arguments at the wrong time/place) However lookingat your logs, I would suspect it is an error in git

Re: [PATCH 3/4] t1300: fix the new --show-origin tests on Windows

Johannes Schindelin writes: > On Windows, we have that funny situation where the test script can refer > to POSIX paths because it runs in a shell that uses a POSIX emulation > layer ("MSYS2 runtime"). Yet, git.exe does *not* understand POSIX paths > at all but only

Re: [PATCH 4/4] mingw: skip some tests in t9115 due to file name issues

Johannes Schindelin wrote: > These two tests wanted to write file names which are incompatible with > Windows' file naming rules. Makes sense. Ideally these would use the FUNNYNAMES prereq which would be factored out as a lazy prereq from t3600, t4135, and t9903. But using !MINGW is simpler and

Re: [PATCH 2/4] Make t1300-repo-config resilient to being run via 'sh -x'

Johannes Schindelin writes: > One of this developer's primary tools to diagnose broken regression > tests is to run the test script using 'sh -x t... -i -v' to find out > *which* call *actually* demonstrates the symptom. > > Hence it is pretty counterproductive if the

Re: [PATCH v2] bisect--helper: convert a function in shell to C

On Tue, Mar 22, 2016 at 10:52 AM, Pranit Bauva wrote: > OPT_CMDMODE() is actually a better option. I also noticed that it > isn't mentioned in Documentation/technical/api-parse-options.txt . > Should I send a patch to include it there just to make it easier for > someone

[PATCH] submodule helper: accept '.' for repositories with no submodules

In 74703a1e4d (2015-09-02, submodule: rewrite `module_list` shell function in C), "submodule deinit ." was broken. The original module_list accepted '.' as a pathspec just fine, as it was using git ls-files -z --error-unmatch --stage -- "$@" || { custom filtering} and git ls-files doesn't

Re: [PATCH 2/4] Make t1300-repo-config resilient to being run via 'sh -x'

Johannes Schindelin wrote: > --- a/t/t1300-repo-config.sh > +++ b/t/t1300-repo-config.sh > @@ -699,17 +699,13 @@ test_expect_success 'invalid unit' ' > echo 1auto >expect && > git config aninvalid.unit >actual && > test_cmp expect actual && > - cat >expect <<-\EOF && > -

Re: [PATCH 1/4] config --show-origin: report paths with forward slashes

Johannes Schindelin writes: > On Windows, the backslash is the native directory separator, but > all supported Windows versions also accept the forward slash in > most circumstances. > > Our tests expect forward slashes. > > Relative paths are generated by Git using

Re: [PATCH v2] bisect--helper: convert a function in shell to C

On Tue, Mar 22, 2016 at 9:33 PM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> static int one_of(const char *term, ...) >> { >> va_list matches; >> const char *match; >> >> va_start(matches, term); >> while ((match

Re: [PATCH 0/4] Git for Windows fixes in preparation for 2.8.0

Johannes Schindelin writes: > The t1300 and t9115 tests regressed on Windows. These patches fix that. Thanks, it might be probably too late for 2.8.0 final to do back-and-forth reviews, but lets see how it goes. > > > Johannes Schindelin (4): > config

Re: [PATCH v2] bisect--helper: convert a function in shell to C

On Tue, Mar 22, 2016 at 8:41 PM, Johannes Schindelin wrote: > Hi, > > On Tue, 22 Mar 2016, Johannes Schindelin wrote: > >> On Tue, 22 Mar 2016, Pranit Bauva wrote: >> >> > + if (!strcmp(term, "bad") || !strcmp(term, "new")) >> > + if(strcmp(revision,

Re: [PATCH] (exit 1) is silly

Sebastian Schuberth writes: > On 3/22/2016 17:16, Junio C Hamano wrote: > >> IMO, this is such a minor thing that once it _is_ in the tree, it's >> not really worth the patch noise to go and fix it up. > > IMO, instead of writing this you could have just accepted the patch,

Re: [PATCH v2] bisect--helper: convert a function in shell to C

On Tue, Mar 22, 2016 at 8:39 PM, Johannes Schindelin wrote: > Hi, > > On Tue, 22 Mar 2016, Pranit Bauva wrote: > >> Convert the code literally without changing its design even though it >> seems that its obscure as to the use of comparing revision to different > >

[PATCH 3/4] t1300: fix the new --show-origin tests on Windows

On Windows, we have that funny situation where the test script can refer to POSIX paths because it runs in a shell that uses a POSIX emulation layer ("MSYS2 runtime"). Yet, git.exe does *not* understand POSIX paths at all but only pure Windows paths. So let's just convert the POSIX paths to

[PATCH 4/4] mingw: skip some tests in t9115 due to file name issues

These two tests wanted to write file names which are incompatible with Windows' file naming rules. Signed-off-by: Johannes Schindelin --- t/t9115-git-svn-dcommit-funky-renames.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

Re: [ANNOUNCE] Git v2.8.0-rc2

Michael J Gruber writes: > Junio C Hamano venit, vidit, dixit 21.03.2016 21:01: > >> If that is the case, perhaps it >> is also a valid workflow for these collaborating authors of a single >> document not to update the build product, if they know that nobody >> cares

[PATCH 1/4] config --show-origin: report paths with forward slashes

On Windows, the backslash is the native directory separator, but all supported Windows versions also accept the forward slash in most circumstances. Our tests expect forward slashes. Relative paths are generated by Git using forward slashes. So let's try to be consistent and use forward slashes

[PATCH 2/4] Make t1300-repo-config resilient to being run via 'sh -x'

One of this developer's primary tools to diagnose broken regression tests is to run the test script using 'sh -x t... -i -v' to find out *which* call *actually* demonstrates the symptom. Hence it is pretty counterproductive if the test script behaves differently when being run via 'sh -x', in

[PATCH 0/4] Git for Windows fixes in preparation for 2.8.0

The t1300 and t9115 tests regressed on Windows. These patches fix that. Johannes Schindelin (4): config --show-origin: report paths with forward slashes Make t1300-repo-config resilient to being run via 'sh -x' t1300: fix the new --show-origin tests on Windows mingw: skip some tests in

Re: [RFC_PATCHv4 4/7] submodule init: redirect stdout to stderr

Junio C Hamano writes: > Sebastian Schuberth writes: > >> Just wondering, what's Git's policy on this? This message is neither >> an error nor a warning, but just purely informational. As such it >> semantically does not belong to stderr, or? > > Some

Re: "git submodule deinit -f ." no longer works when there are no submodules

On Tue, Mar 22, 2016 at 2:25 AM, Per Cederqvist wrote: > It used to be possible to run > > git submodule deinit -f . > > to remove any submodules, no matter how many submodules you had. That > is no longer possible in projects that don't have any submodules at > all. The

Re: [PATCH v2] branch -D: allow - as abbreviation of '@{-1}'

Junio C Hamano writes: > I _think_ strbuf_branchname() leaves "@{-}" when you do not have > enough branch switches in the reflog, so perhaps ... This is a tangent, but the value returned from strbuf_branchname() is not well documented, and nobody looks at it. It might not be

Re: [PATCH] (exit 1) is silly

On 3/22/2016 17:16, Junio C Hamano wrote: IMO, this is such a minor thing that once it _is_ in the tree, it's not really worth the patch noise to go and fix it up. IMO, instead of writing this you could have just accepted the patch, reducing the patch noise ;-) Regards, Sebastian -- To

Re: [PATCH v2] branch -D: allow - as abbreviation of '@{-1}'

Elena Petrashen writes: > +static int expand_dash_shortcut(const char **argv, int dash_position) > +{ > + if (!strcmp(argv[dash_position], "-")){ > + argv[dash_position] = "@{-1}"; > + return 1; > + } > + return 0; > +} > int

Re: [RFC_PATCHv4 4/7] submodule init: redirect stdout to stderr

On Tue, Mar 22, 2016 at 5:47 PM, Stefan Beller wrote: > I think the stance of Git is to write only machine readable stuff to stdout, > and essentially all _(translated) stuff (i.e. human readable) goes to stderr > as > some sort of help or progress indication. Thanks for

Re: [PATCH v2] bisect--helper: convert a function in shell to C

Hi Junio, On Tue, 22 Mar 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >>struct option options[] = { > >>OPT_BOOL(0, "next-all", _all, > >> N_("perform 'git bisect next'")), > >>OPT_BOOL(0,

Re: [RFC_PATCHv4 4/7] submodule init: redirect stdout to stderr

On Tue, Mar 22, 2016 at 9:14 AM, Junio C Hamano wrote: > Sebastian Schuberth writes: My commit message is bad, and I should feel bad. ;) Quoting from 68b939b2f097b6675 (2013-09-18, clone: send diagnostic messages to stderr, by Jeff who writes the best

Re: [PATCH] (exit 1) is silly

izabera writes: > Signed-off-by: izabera > --- > GIT-VERSION-GEN | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN > index b5072a2..17b6ef4 100755 > --- a/GIT-VERSION-GEN > +++ b/GIT-VERSION-GEN

Re: [RFC_PATCHv4 4/7] submodule init: redirect stdout to stderr

Sebastian Schuberth writes: > Just wondering, what's Git's policy on this? This message is neither > an error nor a warning, but just purely informational. As such it > semantically does not belong to stderr, or? Some people believe that a clean execution should not give

Re: [PATCH v2] bisect--helper: convert a function in shell to C

Johannes Schindelin writes: > static int one_of(const char *term, ...) > { > va_list matches; > const char *match; > > va_start(matches, term); > while ((match = va_arg(matches, const char *))) > if (!strcmp(term, match)) >

Re: git fails updating submodule only if --quiet is specified

I did a bunch more investigation: My original problem was that it would work on a terminal, but not when running under jenkins. Turns out the “-v” in the "index-pack” step is whats leading to the error. I can reproduce the issue with the command "git submodule update --init --recursive >

[PATCH] (exit 1) is silly

Signed-off-by: izabera --- GIT-VERSION-GEN | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index b5072a2..17b6ef4 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -14,7 +14,7 @@ then elif test -d ${GIT_DIR:-.git} -o

Re: [PATCH v2] bisect--helper: convert a function in shell to C

Hi, On Tue, 22 Mar 2016, Johannes Schindelin wrote: > On Tue, 22 Mar 2016, Pranit Bauva wrote: > > > + if (!strcmp(term, "bad") || !strcmp(term, "new")) > > + if(strcmp(revision, "bad")) > > + die("can't change the meaning of term '%s'", term); > > + > > + if

Re: [PATCH v2] bisect--helper: convert a function in shell to C

Hi, On Tue, 22 Mar 2016, Pranit Bauva wrote: > Convert the code literally without changing its design even though it > seems that its obscure as to the use of comparing revision to different s/its/it is/ > bisect arguments which seems like a problem in shell because of the way > function

git fails updating submodule only if --quiet is specified

Hello, I’m running into a nasty issue where “git submodule update —init” fails if I add “—quiet” Following you can find the output with GIT_TRACE=1: WITHOUT --quiet: GIT_TRACE=1 git submodule update --init --recursive 15:51:48.248945 git.c:561 trace: exec: 'git-submodule'

Re: [PATCH v6 4/4] config: add '--show-origin' option to print the origin of a config value

Hi Lars, On Thu, 3 Mar 2016, Lars Schneider wrote: > > On 02 Mar 2016, at 18:33, Johannes Sixt wrote: > > > > Am 19.02.2016 um 10:16 schrieb larsxschnei...@gmail.com: > >> +test_expect_success '--show-origin with --list' ' > >> + cat >expect <<-EOF && > >> +

git-apply does not work in a sub-directory of a Git repository

Hello everyone, Recently while using git-apply, I observed that if git-apply is used in a sub-directory of a Git repository then it silently dies without doing anything. Here's what I did ~ $mkdir example ~ $cd example example $git init Initialized empty Git repository in /home/mj/example/.git/

Re: [PATCH 00/16] git bisect improvements

On Tue, Mar 22, 2016 at 3:52 AM, Stephan Beyer wrote: >> If it is okay with you then can I work more upon these >> patches in my GSoC project. > > I'm totally fine with that, of course. :) Thanks! :) I will try and fix the left over bug if time persists. Regards, Pranit Bauva

Re: [ANNOUNCE] Git v2.8.0-rc2

Junio C Hamano venit, vidit, dixit 21.03.2016 21:01: > Michael J Gruber writes: > >> I think this is a general question about how to track build >> products. The proper place may be in a tree that is referenced >> from a note or so. > >> Maybe I shouldn't consider

Re: [PATCH v2] branch -D: allow - as abbreviation of '@{-1}'

Hi, and thanks for the quick reroll. A small advice: don't hesitate to reply to reviewers in the thread for v1. As a reviewer, I appreciate a quick reply like "OK, will do in v2", or even "I disagree, I think my version is better because: ..." (I'm not _always_ right ;-) ). Elena Petrashen

Re: git and concurrent access to local repository

On 2016-03-22 09.00, Boettger, Heiko wrote: > Hi, > > I always thought git allows concurrent access to a repository and expected > that this also is true when working with local repositories. The only problem > I was aware of is that the use of NFS and windows shares might cause > problems.

Re: [GSOC/RFC] GSoC Proposal Draft | Git Beginner

Updated examples with better description for force push and reset HEAD, as suggested by Lars [11]. Thanks and regards, Sidhant Sharma [11]: http://thread.gmane.org/gmane.comp.version-control.git/289365/focus=289495 --- Implement a beginner mode for Git. Abstract Git is a very powerful

"git submodule deinit -f ." no longer works when there are no submodules

It used to be possible to run git submodule deinit -f . to remove any submodules, no matter how many submodules you had. That is no longer possible in projects that don't have any submodules at all. The command will fail with: error: pathspec '.' did not match any file(s) known to

Re: [GSOC/RFC] GSoC Proposal Draft | Git Beginner

On Tuesday 22 March 2016 02:08 PM, Lars Schneider wrote: > On 21 Mar 2016, at 11:19, Sidhant Sharma wrote: > >> Hi, >> I updated the draft with links, ggit usage examples and some changes to the >> timeline. I placed the links with reference here, but in the Google Doc,

Re: [PATCH v7 04/33] files-backend: break out ref reading

On 03/20/2016 06:03 AM, Michael Haggerty wrote: > On 03/01/2016 01:52 AM, David Turner wrote: >> Refactor resolve_ref_1 in terms of a new function read_raw_ref, which >> is responsible for reading ref data from the ref storage. >> >> Later, we will make read_raw_ref a pluggable backend function,

  1   2   >