Re: gitconfig get out of sync with submodule entries on branch switch

Hi Brandon I did try your suggestion, so basically: git checkout branch git submodule init git submodule update Unfortunately, I still have two entries in my git config this way. It seems that git submodule update only considers submodules listed in .gitmodules. The background of my

Git clonebundles

Hi all, Bitbucket recently added support for Mercurial’s clonebundle extension (http://gregoryszorc.com/blog/2015/10/22/cloning-improvements-in-mercurial-3.6/). Mercurial’s clone bundles allow the Mercurial client to seed a repository using a bundle file instead of dynamically generating a bundle

Re: [PATCH 1/4] git-prompt.sh: add submodule indicator

Benjamin Fuchs writes: > In [2/4] I got rid of the loop by feedback of Gábor. > Sorry if my patch wasn't well formed. While it might be the way other development communities work, in the Git development community, we do not work that way when presenting your second and

Re: difflame

Maybe a little work on blame to get the actual revision where some lines were "deleted"? Something like git blame --blame-deletion that could be based on --reverse? On Mon, Jan 30, 2017 at 7:35 PM, Edmundo Carmona Antoranz wrote: > I'm thinking of something like this: > >

Re: [PATCH] blame: draft of line format

I'm basing in on the "pretty API" so that we don't have to reinvent the wheel. I have already noticed that many of the formatting options available for pretty are not working... I'm sure it would require some work setting up the call to pretty api but the basic is laid out there. Let me know of

[PATCH] blame: draft of line format

--- builtin/blame.c | 24 1 file changed, 24 insertions(+) diff --git a/builtin/blame.c b/builtin/blame.c index 126b8c9e5..89c1a862d 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -52,6 +52,7 @@ static int xdl_opts; static int abbrev = -1; static int

Re: difflame

I'm thinking of something like this: Say I just discovered a problem in a file I want to see who worked on it since some revision that I know is working fine (or even something as generic as HEAD~100..). It could be a number of people with different revisions. I would diff to see what

Re: [RFC] Proof of concept: Support multiple authors

On Monday 30 January 2017 12:48:52 Junio C Hamano wrote: > > https://public-inbox.org/git/?q=gmane:83880 > https://public-inbox.org/git/?q=gmane:146223 > https://public-inbox.org/git/?q=gmane:146886 Thanks for putting the links together. That's very useful as a reference. > The older

Re: [ANNOUNCE] Git Merge Contributor Summit topic planning

On Tue, Jan 31, 2017 at 01:48:05AM +0100, Jeff King wrote: > The list of topics is totally open. If you're coming and have something > you'd like to present or discuss, then propose it here. If you're _not_ > coming, you may still chime in with input on topics, but please don't > suggest a topic

[ANNOUNCE] Git Merge Contributor Summit topic planning

The Contributor Summit is only a few days away; I'd like to work out a few bits of logistics ahead of time. We're up to 26 attendees. The room layout will probably be three big round-tables, with a central projector. We should be able to have everybody pay attention to a single speaker, or break

Re: [PATCH] Completion: Add support for --submodule=diff

On Sun, Dec 4, 2016 at 6:41 AM, wrote: > From: Peter Law > > Teach git-completion.bash about the 'diff' option to 'git diff > --submodule=', which was added in Git 2.11. > > Signed-off-by: Peter Law > --- >

Re: [PATCH 1/4] git-prompt.sh: add submodule indicator

Hi Junio, thanks for your reply. Some of your suggestions are covered by my rework in Patch [2/4]. In [2/4] I got rid of the loop by feedback of Gábor. Sorry if my patch wasn't well formed. On 31.01.2017 00:48, Junio C Hamano wrote: Benjamin Fuchs writes: I

Re: [PATCH 1/4] git-prompt.sh: add submodule indicator

Benjamin Fuchs writes: > I expirienced that working with submodules can be confusing. This indicator > will make you notice very easy when you switch into a submodule. I am not quite sure what the above wants to say. If you work on two projects, A and B, then having

Re: [PATCH v3 2/3] refs: add option core.logAllRefUpdates = always

On Mon, Jan 30, 2017 at 01:58:10PM -0800, Junio C Hamano wrote: > > When writing the test for git-tag, I realized that the option > > --no-create-reflog to git-tag does not take precedence over > > logAllRefUpdate=always. IOW the setting cannot be overridden on the > > command > >

Re: difflame

On Mon, Jan 30, 2017 at 01:08:41PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > On Tue, Jan 17, 2017 at 11:24:02PM -0600, Edmundo Carmona Antoranz wrote: > > > >> For a very long time I had wanted to get the output of diff to include > >> blame information as well (to

Re: [PATCH] merge-recursive: make "CONFLICT (rename/delete)" message show both paths

Matt McCutchen writes: > The current message printed by "git merge-recursive" for a rename/delete > conflict is like this: > > CONFLICT (rename/delete): new-path deleted in HEAD and renamed in > other-branch. Version other-branch of new-path left in tree. > > To be more

Re: [PATCH 0/5] introduce SWAP macro

René Scharfe writes: > Exchanging the value of two variables requires declaring a temporary > variable and repeating their names. The swap macro in apply.c > simplifies this for its callers without changing the compiled binary. > Polish this macro and export it, then use it

Re: [PATCH] Completion: Add support for --submodule=diff

Peter Law writes: >> Teach git-completion.bash about the 'diff' option to 'git diff >> --submodule=', which was added in Git 2.11. > > I posted this patch back in December, but I've not heard anything. I'm > sure as maintainers you're all quite busy, but I was wondering how

Re: [PATCH v3 2/3] refs: add option core.logAllRefUpdates = always

Junio C Hamano writes: >> diff --git a/builtin/checkout.c b/builtin/checkout.c >> index bfe685c..81ea2ed 100644 >> --- a/builtin/checkout.c >> +++ b/builtin/checkout.c >> @@ -612,14 +612,12 @@ static void update_refs_for_switch(const struct >> checkout_opts *opts, >>

Re: [PATCH v4 0/5] urlmatch: allow wildcard-based matches

Junio C Hamano writes: > Patrick Steinhardt writes: > >> - I realized that with my patches, "ranking" of URLs was broken. >>Previously, we've always taken the longest matching URL. As >>previously, only the user and path could actually

Re: [PATCH] checkout: convert post_checkout_hook() to struct object_id

On Mon, Jan 30, 2017 at 02:01:12PM +0100, Johannes Schindelin wrote: > Hi René, > > On Sat, 28 Jan 2017, René Scharfe wrote: > > > Signed-off-by: Rene Scharfe > > These three SHA-1 -> OID patches all appear correct to me. I concur. These look good. -- brian m. carlson / brian

Re: [PATCH 4/5] diff: use SWAP macro

René Scharfe writes: > Use the macro SWAP to exchange the value of pairs of variables instead > of swapping them manually with the help of a temporary variable. The > resulting code is shorter and easier to read. > > The two cases were not transformed by the semantic patch

Re: [PATCH 3/5] use SWAP macro

René Scharfe writes: > if (tree2->flags & UNINTERESTING) { > - struct object *tmp = tree2; > - tree2 = tree1; > - tree1 = tmp; > + SWAP(tree2, tree1); A human would have written this

Re: [PATCH 1/5] add SWAP macro

On 01/30, René Scharfe wrote: > Am 30.01.2017 um 22:03 schrieb Johannes Schindelin: > >It is curious, though, that an > >expression like "sizeof(a++)" would not be rejected. > > Clang normally warns about something like this ("warning: expression > with side effects has no effect in an

Re: [PATCH 1/5] add SWAP macro

Am 30.01.2017 um 22:03 schrieb Johannes Schindelin: It is curious, though, that an expression like "sizeof(a++)" would not be rejected. Clang normally warns about something like this ("warning: expression with side effects has no effect in an unevaluated context [-Wunevaluated-expression]"),

Re: [PATCH v4 0/5] urlmatch: allow wildcard-based matches

Patrick Steinhardt writes: > - I realized that with my patches, "ranking" of URLs was broken. >Previously, we've always taken the longest matching URL. As >previously, only the user and path could actually differ, only >these two components were used for

Re: [PATCH v3 2/3] refs: add option core.logAllRefUpdates = always

cornelius.w...@tngtech.com writes: > Notes: > Changes wrt v2: > > - change wording in commit message s/do not typically/are not meant to/; > - in update_refs_for_switch move refname to the enclosing block, so that >should_autocreate_reflog has access. Thanks Junio for

Re: [PATCH 1/5] add SWAP macro

Am 30.01.2017 um 21:48 schrieb Johannes Schindelin: So I tried to verify that Visual C optimizes this well, and oh my deity, this was not easy. In Debug mode, it does not optimize, i.e. the memcpy() will be called, even for simple 32-bit integers. In Release mode, Visual Studio's defaults turn

Re: [PATCH] Completion: Add support for --submodule=diff

On 01/30, Peter Law wrote: > Hi, > > > Teach git-completion.bash about the 'diff' option to 'git diff > > --submodule=', which was added in Git 2.11. > > I posted this patch back in December, but I've not heard anything. I'm > sure as maintainers you're all quite busy, but I was wondering how >

Re: [PATCH] Completion: Add support for --submodule=diff

Hi, > Teach git-completion.bash about the 'diff' option to 'git diff > --submodule=', which was added in Git 2.11. I posted this patch back in December, but I've not heard anything. I'm sure as maintainers you're all quite busy, but I was wondering how long it usually takes to get a response to

Re: [PATCH v2 1/4] Documentation/stash: remove mention of git reset --hard

Thomas Gummerer writes: > Don't mention git reset --hard in the documentation for git stash save. > It's an implementation detail that doesn't matter to the end user and > thus shouldn't be exposed to them. Everybody understands what "reset --hard" does; it can be an

Re: [PATCH v2 2/4] stash: introduce push verb

Thomas Gummerer writes: > Introduce a new git stash push verb in addition to git stash save. The > push verb is used to transition from the current command line arguments > to a more conventional way, in which the message is specified after a -m > parameter instead of

Re: [PATCH v2 4/4] stash: support filename argument

Thomas Gummerer writes: > Add an optional filename argument to git stash push, which allows for > stashing a single (or multiple) files. You can give pathspec with one or more elements, so "an optional argument" sounds too limiting. Allow 'git stash push' to take

Re: [PATCH v2 3/4] introduce new format for git stash create

Thomas Gummerer writes: > create_stash () { > - stash_msg="$1" > - untracked="$2" > + stash_msg= > + untracked= > + new_style= > ... > + while test $# != 0 > + do > + case "$1" in > + -m|--message) > +

Re: [PATCH 1/5] add SWAP macro

Hi Hannes, On Mon, 30 Jan 2017, Johannes Sixt wrote: > Am 30.01.2017 um 17:01 schrieb Johannes > Schindelin: > > On Sat, 28 Jan 2017, René Scharfe wrote: > > > diff --git a/git-compat-util.h > > > b/git-compat-util.h > > > index 87237b092b..66cd466eea 100644 > > > --- a/git-compat-util.h > > >

Re: difflame

Jeff King writes: > On Tue, Jan 17, 2017 at 11:24:02PM -0600, Edmundo Carmona Antoranz wrote: > >> For a very long time I had wanted to get the output of diff to include >> blame information as well (to see when something was added/removed). > > This is something I've wanted, too.

Re: [RFC] Proof of concept: Support multiple authors

Christian Couder writes: > I am just wondering if you have read and taken into account the > previous threads on this mailing list about the same subject, like for > example this one: > >

Re: [PATCH 1/5] add SWAP macro

Hi René, On Mon, 30 Jan 2017, René Scharfe wrote: > Am 30.01.2017 um 16:39 schrieb Johannes Schindelin: > > > On Sat, 28 Jan 2017, René Scharfe wrote: > > > > > Add a macro for exchanging the values of variables. It allows users > > > to avoid repetition and takes care of the temporary variable

[PATCH 0/4] git-prompt.sh: Full patch for submodule indicator

Hi everyone, since I didn't get a response I decided to sent my patch again. Maybe it was because I to sent my consecutive commits the wrong way, so a new try. First thanks again Steffen and Gábor for your feedback. Based on the first feedback I rework the indicator and it is now way cheaper

[PATCH 4/4] git-prompt.sh: add tests for submodule indicator

Signed-off-by: Benjamin Fuchs --- t/t9903-bash-prompt.sh | 43 +++ 1 file changed, 43 insertions(+) diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index 97c9b32..4dce366 100755 --- a/t/t9903-bash-prompt.sh +++

[PATCH 3/4] git-prompt.sh: fix for submodule 'dirty' indicator

Fixing wrong git diff line. Signed-off-by: Benjamin Fuchs --- contrib/completion/git-prompt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index c44b9a2..43b28e9 100644 ---

[PATCH 2/4] git-prompt.sh: rework of submodule indicator

Rework of the first patch. The prompt now will look like this: (+name:master). I tried to considere all suggestions. Tests still missing. Signed-off-by: Benjamin Fuchs --- contrib/completion/git-prompt.sh | 49 1 file changed, 24

[PATCH 1/4] git-prompt.sh: add submodule indicator

I expirienced that working with submodules can be confusing. This indicator will make you notice very easy when you switch into a submodule. The new prompt will look like this: (sub:master) Adding a new optional env variable for the new feature. Signed-off-by: Benjamin Fuchs

Re: [RFC] Proof of concept: Support multiple authors

On Monday 30 January 2017 18:56:42 Christian Couder wrote: > On Sun, Jan 29, 2017 at 7:06 PM, Cornelius Schumacher > wrote: > > This patch is a proof of concept implementation of support for > > multiple authors. It adds an optional `authors` header to commits > > which is set

Re: [PATCH 1/5] add SWAP macro

Am 30.01.2017 um 17:01 schrieb Johannes Schindelin: On Sat, 28 Jan 2017, René Scharfe wrote: diff --git a/git-compat-util.h b/git-compat-util.h index 87237b092b..66cd466eea 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -527,6 +527,16 @@ static inline int ends_with(const char *str,

Re: [RFC] Proof of concept: Support multiple authors

Hi, On Sun, Jan 29, 2017 at 7:06 PM, Cornelius Schumacher wrote: > This patch is a proof of concept implementation of support for > multiple authors. It adds an optional `authors` header to commits > which is set when there are authors configured in the git config. I am just

[PATCH v3 16/27] attr: convert git_all_attrs() to use "struct attr_check"

From: Junio C Hamano This updates the other two ways the attribute check is done via an array of "struct attr_check_item" elements. These two niches appear only in "git check-attr". * The caller does not know offhand what attributes it wants to ask about and cannot use

[PATCH v3 15/27] attr: (re)introduce git_check_attr() and struct attr_check

From: Junio C Hamano A common pattern to check N attributes for many paths is to (1) prepare an array A of N attr_check_item items; (2) call git_attr() to intern the N attribute names and fill A; (3) repeatedly call git_check_attrs() for path with N and A; A look-up for

Re: gitconfig get out of sync with submodule entries on branch switch

On 01/30, Benjamin Schindler wrote: > Hi > > Consider the following usecase: I have the master branch where I > have a submodule A. I create a branch where I rename the submodule > to be in the directory B. After doing all of this, everything looks > good. > Now, I switch back to master. The

Re: [PATCH 5/5] graph: use SWAP macro

Am 30.01.2017 um 17:16 schrieb Johannes Schindelin: Hi René, On Sat, 28 Jan 2017, René Scharfe wrote: Exchange the values of graph->columns and graph->new_columns using the macro SWAP instead of hand-rolled code. The result is shorter and easier to read. This transformation was not done by

Re: [PATCH 3/5] use SWAP macro

Am 30.01.2017 um 17:03 schrieb Johannes Schindelin: Hi René, On Sat, 28 Jan 2017, René Scharfe wrote: diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index 806dd7a885..8ce00480cd 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -147,9 +147,7 @@ int cmd_diff_tree(int argc,

Re: [PATCH 4/5] diff: use SWAP macro

Am 30.01.2017 um 17:04 schrieb Johannes Schindelin: Hi René, On Sat, 28 Jan 2017, René Scharfe wrote: Use the macro SWAP to exchange the value of pairs of variables instead of swapping them manually with the help of a temporary variable. The resulting code is shorter and easier to read. The

Re: git-daemon shallow checkout fail

On Sat, Jan 28, 2017 at 05:29:32PM -0700, Bob Proulx wrote: > However the problem driving me crazy is that this only fails this way > on one machine. Unfortunately failing on the machine I need to use. > If I try this same setup on any other machine I try then there is no > failure and it works

Re: [PATCH v2] git-p4: Fix git-p4.mapUser on Windows

Luke Diamand writes: > On 27 January 2017 at 17:33, Junio C Hamano wrote: >> >> Luke, Lars, this version seems to be in line with the conclusion of >> your earlier reviews, e.g. >> >> >> >>

Re: [PATCH v2] help: improve is_executable() on Windows

Johannes Schindelin writes: > From: Heiko Voigt > > On Windows, executables need to have the file extension `.exe`, or they > are not executables. Hence, to support scripts, Git for Windows also > looks for a she-bang line by opening the file in

Re: [PATCH v3] mingw: allow hooks to be .exe files

Johannes Schindelin writes: > Executable files in Windows need to have the extension '.exe', otherwise > they do not work. Extend the hooks to not just look at the hard coded > names, but also at the names extended by the custom STRIP_EXTENSION, > which is defined as

Re: [PATCH 1/5] add SWAP macro

Am 30.01.2017 um 17:01 schrieb Johannes Schindelin: Hi René, On Sat, 28 Jan 2017, René Scharfe wrote: diff --git a/git-compat-util.h b/git-compat-util.h index 87237b092b..66cd466eea 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -527,6 +527,16 @@ static inline int ends_with(const

Re: git-daemon shallow checkout fail

Hi Bob, On Sat, 28 Jan 2017, Bob Proulx wrote: > And the server side says: > > [26071] Request upload-pack for '/test-project.git' > [26071] fatal: Unable to create temporary file > '/srv/git/test-project.git/shallow_xKwnvZ': Permission denied > [26055] [26071] Disconnected (with error)

Re: [PATCH 1/5] add SWAP macro

Am 30.01.2017 um 16:39 schrieb Johannes Schindelin: Hi René, On Sat, 28 Jan 2017, René Scharfe wrote: Add a macro for exchanging the values of variables. It allows users to avoid repetition and takes care of the temporary variable for them. It also makes sure that the storage sizes of its

Re: [PATCH 5/5] graph: use SWAP macro

Hi René, On Sat, 28 Jan 2017, René Scharfe wrote: > Exchange the values of graph->columns and graph->new_columns using the > macro SWAP instead of hand-rolled code. The result is shorter and > easier to read. > > This transformation was not done by the semantic patch swap.cocci > because

gitconfig get out of sync with submodule entries on branch switch

Hi Consider the following usecase: I have the master branch where I have a submodule A. I create a branch where I rename the submodule to be in the directory B. After doing all of this, everything looks good. Now, I switch back to master. The first oddity is, that it fails to remove the

Re: [PATCH 4/5] diff: use SWAP macro

Hi René, On Sat, 28 Jan 2017, René Scharfe wrote: > Use the macro SWAP to exchange the value of pairs of variables instead > of swapping them manually with the help of a temporary variable. The > resulting code is shorter and easier to read. > > The two cases were not transformed by the

Re: [PATCH 3/5] use SWAP macro

Hi René, On Sat, 28 Jan 2017, René Scharfe wrote: > diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c > index 806dd7a885..8ce00480cd 100644 > --- a/builtin/diff-tree.c > +++ b/builtin/diff-tree.c > @@ -147,9 +147,7 @@ int cmd_diff_tree(int argc, const char **argv, const char > *prefix) >

Re: [PATCH 1/5] add SWAP macro

Hi René, On Sat, 28 Jan 2017, René Scharfe wrote: > diff --git a/git-compat-util.h b/git-compat-util.h > index 87237b092b..66cd466eea 100644 > --- a/git-compat-util.h > +++ b/git-compat-util.h > @@ -527,6 +527,16 @@ static inline int ends_with(const char *str, const char > *suffix) >

Re: [PATCH 1/5] add SWAP macro

Hi René, On Sat, 28 Jan 2017, René Scharfe wrote: > Add a macro for exchanging the values of variables. It allows users to > avoid repetition and takes care of the temporary variable for them. It > also makes sure that the storage sizes of its two parameters are the > same. Its memcpy(1)

Re: [PATCH v4] t/Makefile: add a rule to re-run previously-failed tests

Hi Junio, On Fri, 27 Jan 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > This patch automates the process of determining which tests failed > > previously and re-running them. > > ... > > > > Signed-off-by: Johannes Schindelin

Re: [PATCH] help: correct behavior for is_executable on Windows

Hi Junio, On Fri, 27 Jan 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > From: Heiko Voigt > > > > The previous implementation said that the filesystem information on > > Windows is not reliable to determine whether a file is

Re: [PATCH] checkout: convert post_checkout_hook() to struct object_id

Hi René, On Sat, 28 Jan 2017, René Scharfe wrote: > Signed-off-by: Rene Scharfe These three SHA-1 -> OID patches all appear correct to me. Ciao, Dscho

[PATCH v2] help: improve is_executable() on Windows

From: Heiko Voigt On Windows, executables need to have the file extension `.exe`, or they are not executables. Hence, to support scripts, Git for Windows also looks for a she-bang line by opening the file in question, and executing it via the specified script interpreter. To

Re: [PATCH] fixup! worktree move: new command

Hi Junio, On Fri, 27 Jan 2017, Junio C Hamano wrote: > The tip of 'pu' (or anything beyond the tip of 'jch') is not always > expected to pass test or even build, [...] This makes `pu` a lot less useful than it could be. And we could easily improve the situation simply by changing the rule ever

Re: [PATCH] mingw: allow hooks to be .exe files

Hi Stefan, On Fri, 27 Jan 2017, Stefan Beller wrote: > On Fri, Jan 27, 2017 at 2:29 AM, Johannes Schindelin > wrote: > > Hi Junio, > > > > On Thu, 26 Jan 2017, Junio C Hamano wrote: > > > >> Johannes Schindelin writes: > >> > >> > On Wed,

[PATCH v3] mingw: allow hooks to be .exe files

Executable files in Windows need to have the extension '.exe', otherwise they do not work. Extend the hooks to not just look at the hard coded names, but also at the names extended by the custom STRIP_EXTENSION, which is defined as '.exe' in Windows. Signed-off-by: Johannes Schindelin

Hello.

I Richard Fennell, From Bendigo Bank Australia and I am writing this letter to submit an interesting innovating business idea that I would like to share with you, the business is real and risk free, it shall be done in accordance with the appropriate banking regulation and finance policy. You