Re: [PATCH v2 00/10] rebase -i: offer to recreate merge commits

On Wed, Jan 31, 2018 at 5:29 AM, Johannes Schindelin wrote: > I think I may want to introduce a bigger change, still. I forgot who > exactly came up with the suggestion to use `merge -C > ` (I think it was Jake), and I reacted too forcefully in > rejecting it. > I

Re: git add --all does not respect submodule..ignore

On Tue, Jan 30, 2018 at 1:56 PM, Stefan Beller wrote: > The assume-unchanged bit is a performance optimisation for powerusers, > but its documentation words it in a less dangerous way, such that it sounds > as if it is a UX feature instead of a performance thing. I'd stay away

Re: [RFC PATCH 0/1] Implement CMake build

On Wed, Jan 24, 2018 at 5:45 AM, Isaac Hier wrote: > I realize this is a huge patch, but does anyone have feedback for the > general idea? > I don't know anything about CMake so I can't comment on the patch itself. Having additional build systems does not bother me, but it

Re: Feature request: Improve diff algorithm

On Wed, Jan 24, 2018 at 8:43 AM, KES wrote: > Here is another place where diff can be improved: > @@ -141,8 +140,9 @@ My_runops(pTHX) > // Do not trace variables in DB:: module > if( SvOK( inDB ) ) continue; > > - sv_inc_nomg( inDB

Re: [PATCH] Fixes compile warning with -Wimplicit-fallthrough CFLAGS

On Mon, Jan 22, 2018 at 4:59 PM, Jeff King wrote: > On Mon, Jan 22, 2018 at 07:54:18PM -0500, Eric Sunshine wrote: > >> On Mon, Jan 22, 2018 at 6:51 PM, Elia Pinto wrote: >> > This patch add explicit fallthrough compiler attribute >> > when needed on

Re: [PATCH 2/8] sequencer: introduce the `merge` command

On Fri, Jan 19, 2018 at 6:45 AM, Phillip Wood wrote: > On 18/01/18 15:35, Johannes Schindelin wrote: >> >> This patch is part of the effort to reimplement `--preserve-merges` with >> a substantially improved design, a design that has been developed in the >> Git for

Re: [PATCH 9/8] [DO NOT APPLY, but squash?] git-rebase--interactive: clarify arguments

On Fri, Jan 19, 2018 at 12:30 PM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> Good idea! I would rather do it as an introductory patch (that only >> converts the existing list). >> >> As to `merge`: it is a bit more complicated ;-) >>

Re: [PATCH 1/8] sequencer: introduce new commands to resettherevision

On Fri, Jan 19, 2018 at 10:55 AM, Phillip Wood wrote: > On 19/01/18 12:24, Phillip Wood wrote: >> >> On 18/01/18 15:35, Johannes Schindelin wrote: >>> >>> Internally, the `label ` command creates the ref >>> `refs/rewritten/`. This makes it possible to work with the

Re: [PATCH 10/8] [DO NOT APPLY, but improve?] rebase--interactive: introduce "stop" command

On Thu, Jan 18, 2018 at 2:08 PM, Philip Oakley <philipoak...@iee.org> wrote: > From: "Jacob Keller" <jacob.kel...@gmail.com> >> >> On Thu, Jan 18, 2018 at 10:36 AM, Stefan Beller <sbel...@google.com> >> wrote: >>> >>> Jak

Re: [PATCH 6/8] sequencer: handle autosquash and post-rewrite for merge commands

>> Same for the test here, I can't figure out why this is necessary in >> this patch as opposed to the patch which first introduced the >> refs/rewritten/ refs. > > Woops. This was its own commit, and must have been accidentally squashed > during one of my rebases. Will re-introduce it; Yep that

Re: [PATCH 1/8] sequencer: introduce new commands to reset the revision

On Thu, Jan 18, 2018 at 1:24 PM, Philip Oakley <philipoak...@iee.org> wrote: > From: "Jacob Keller" <jacob.kel...@gmail.com> > >> On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin >> <johannes.schinde...@gmx.de> wrote: >>> >>> This

Re: [PATCH 2/8] sequencer: introduce the `merge` command

On Thu, Jan 18, 2018 at 1:22 PM, Johannes Schindelin wrote: >> Would it be possible to open the editor with the supplied text when >> there's no commit? The text after must be oneline only.. > > I actually want to avoid that because my main use case is

Re: [PATCH 1/8] sequencer: introduce new commands to reset the revision

On Thu, Jan 18, 2018 at 1:13 PM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Jake, > > On Thu, 18 Jan 2018, Jacob Keller wrote: > >> On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin >> <johannes.schinde...@gmx.de> wrote: >> >

Re: [PATCH 10/8] [DO NOT APPLY, but improve?] rebase--interactive: introduce "stop" command

On Thu, Jan 18, 2018 at 10:36 AM, Stefan Beller wrote: > Jake suggested using "x false" instead of "edit" for some corner cases. > > I do prefer using "x false" for all kinds of things such as stopping > before a commit (edit only let's you stop after a commit), and the >

Re: [PATCH 9/8] [DO NOT APPLY, but squash?] git-rebase--interactive: clarify arguments

On Thu, Jan 18, 2018 at 10:36 AM, Stefan Beller wrote: > Up to now each command took a commit as its first argument and ignored > the rest of the line (usually the subject of the commit) > > Now that we have commands that take different arguments, clarify each > command by

Re: [PATCH 0/8] rebase -i: offer to recreate merge commits

On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin wrote: > Once upon a time, I dreamt of an interactive rebase that would not > flatten branch structure, but instead recreate the commit topology > faithfully. > > My original attempt was --preserve-merges, but that

Re: [PATCH 6/8] sequencer: handle autosquash and post-rewrite for merge commands

On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin wrote: > In the previous patches, we implemented the basic functionality of the > `git rebase -i --recreate-merges` command, in particular the `merge` > command to create merge commits in the sequencer. > > The

Re: [PATCH 2/8] sequencer: introduce the `merge` command

On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin wrote: > This patch is part of the effort to reimplement `--preserve-merges` with > a substantially improved design, a design that has been developed in the > Git for Windows project to maintain the dozens of

Re: [PATCH 1/8] sequencer: introduce new commands to reset the revision

On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin wrote: > This commit implements the commands to label, and to reset to, given > revisions. The syntax is: > > label > reset > > As a convenience shortcut, also to improve readability of the

Re: [PATCH 1/2] parse-options: support --git-completion-helper

On Tue, Jan 16, 2018 at 2:36 AM, Nguyễn Thái Ngọc Duy wrote: > This option is designed to be used by git-completion.bash. For many > simple cases, what we do in there is usually > > __gitcomp "lots of completion options" > > which has to be manually updated when a new

Re: [PATCH 5/5] diff: properly error out when combining multiple pickaxe options

On Tue, Jan 2, 2018 at 4:46 PM, Stefan Beller wrote: > die(_("--name-only, --name-status, --check and -s are > mutually exclusive")); > + count = 0; > + > + if (options->pickaxe_opts & DIFF_PICKAXE_KIND_S) > + count++; > + if

Re: Bring together merge and rebase

On Mon, Dec 25, 2017 at 10:02 PM, Carl Baldwin <c...@ecbaldwin.net> wrote: > On Mon, Dec 25, 2017 at 05:47:55PM -0800, Jacob Keller wrote: >> On Mon, Dec 25, 2017 at 5:16 PM, Carl Baldwin <c...@ecbaldwin.net> wrote: >> > Anyway, now I am compelled to use github w

Re: Bring together merge and rebase

On Mon, Dec 25, 2017 at 5:16 PM, Carl Baldwin wrote: > Anyway, now I am compelled to use github which is also a fine tool and I > appreciate all of the work that has gone into it. About 80% of the time, > I rebase and force push to my branch to update a pull request. I've come

Re: Bring together merge and rebase

On Mon, Dec 25, 2017 at 4:16 PM, Carl Baldwin wrote: > On Sat, Dec 23, 2017 at 11:09:59PM +0100, Ęvar Arnfjörš Bjarmason wrote: >> >> But I don't see why you think this needs a new "replaces" parent >> >> pointer orthagonal to parent pointers, i.e. something that would >> >>

Re: Usability outrage as far as I am concerned

On Fri, Dec 22, 2017 at 7:57 AM, Cristian Achim wrote: >> Can you show the output of "git remote" > > # in usb_subfolder > $git remote > origin > $ > > #in home_subfolder > $git remote > $ > With the -v switch you can see where each remote points to (tho your home local

Re: Usability outrage as far as I am concerned

On Wed, Dec 20, 2017 at 8:40 AM, Cristian Achim wrote: > All I will do is paste the stackoverflow question below. It covers the > commands I made in chronological order and the way I would have > expected git to behave differently. > > So I did > > git pull home_subfolder

Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

On Sun, Dec 17, 2017 at 10:40 PM, Jeff King <p...@peff.net> wrote: > On Sun, Dec 17, 2017 at 08:03:41PM -0800, Jacob Keller wrote: > >> I do find it a bit weird that --global writes to one of either file, >> and doesn't read from both. I'd rather have --global "only&q

Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

On Sat, Dec 16, 2017 at 2:01 PM, brian m. carlson wrote: > On Mon, Dec 11, 2017 at 05:05:01PM -0800, Junio C Hamano wrote: >> Jonathan Nieder writes: >> > As for "git config --global", I think the best thing would be to split >> > it into two

Re: [PATCH] doc: Modify git-add doc to say "staging area"

On Tue, Dec 12, 2017 at 6:32 PM, David A. Wheeler wrote: > Change the documentation of git-add so that it consistently uses > the phrase "staging area". The current git documentation uses > inconsistent terminology ("index", "cache", and "staging area"). > This commit

Re: [PATCH] doc: clarify usage of XDG_CONFIG_HOME config file

On Tue, Dec 12, 2017 at 11:47 AM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > >> --global:: >> + For writing options: write to global user configuration file >> + rather than the repository `.git/config`.

Re: [PATCH] doc: clarify usage of XDG_CONFIG_HOME config file

On Tue, Dec 12, 2017 at 7:20 AM, Todd Zullinger <t...@pobox.com> wrote: > Hi Jacob, > > Jacob Keller wrote: >> The documentation for git config and how it reads the user specific >> configuration file is misleading. In some places it implies that >> $XDG_CONFIG_HO

Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

On Tue, Dec 12, 2017 at 6:13 AM, Yaroslav Halchenko wrote: > > On Mon, 11 Dec 2017, Junio C Hamano wrote: > >> Jonathan Nieder writes: > >> > I think the documentation > >> > ~/.gitconfig >> > User-specific configuration file. Also called

Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

On Tue, Dec 12, 2017 at 11:36 AM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > >>> I actually thought that the plan was "you either have this, or the >>> other one, never both at the same time" (

[PATCH] doc: clarify usage of XDG_CONFIG_HOME config file

of the three choices is used. Signed-off-by: Jacob Keller <jacob.kel...@gmail.com> --- Documentation/git-config.txt | 46 +++- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt

Re: [Proposed] Externalize man/html ref for quick-install-man and quick-install-html

On Mon, Dec 11, 2017 at 4:26 PM, Randall S. Becker wrote: > Sorry about the response positioning... > > I can send you a pull request on github, if you want  > You can use https://submitgit.herokuapp.com/ to submit to the mailing list from a pull request. Thanks, Jake

Re: Q: rational for $XDG_CONFIG_HOME/git/config to be "non global" or just a bug?

On Mon, Dec 11, 2017 at 5:05 PM, Junio C Hamano wrote: > Jonathan Nieder writes: > >> I think the documentation >> >> ~/.gitconfig >> User-specific configuration file. Also called "global" >> configuration file. >> >>

Re: [PATCH] docs/pretty-formats: mention commas in %(trailers) syntax

On Thu, Dec 7, 2017 at 9:16 PM, Jeff King wrote: > Commit 84ff053d47 (pretty.c: delimit "%(trailers)" arguments > with ",", 2017-10-01) switched the syntax of the trailers > placeholder, but forgot to update the documentation in > pretty-formats.txt. > > There's need to mention the

Re: [PATCH] diff: add tests for --relative without optional prefix value

On Thu, Dec 7, 2017 at 1:50 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jeff King <p...@peff.net> writes: > >> On Thu, Dec 07, 2017 at 11:01:35AM -0800, Jacob Keller wrote: >> >>> From: Jacob Keller <jacob.kel...@gmail.com> >>> >>>

Re: [PATCH] diff: add tests for --relative without optional prefix value

On Thu, Dec 7, 2017 at 1:12 PM, Jeff King <p...@peff.net> wrote: > On Thu, Dec 07, 2017 at 11:01:35AM -0800, Jacob Keller wrote: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> We already have tests for --relative, but they currently only test when >&

Re: [PATCH] diff: add tests for --relative without optional prefix value

On Thu, Dec 7, 2017 at 11:17 AM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> for type in diff numstat stat raw; do >> - check_$type file2 --relative=subdir/ >> - check_$type file2 --relative=s

[PATCH] diff: add tests for --relative without optional prefix value

From: Jacob Keller <jacob.kel...@gmail.com> We already have tests for --relative, but they currently only test when a prefix has been provided. This fails to test the case where --relative by itself should use the current directory as the prefix. Teach the check_$type functions t

Re: [PATCH v2 7/7] t4045: test 'diff --relative' for real

On Thu, Dec 7, 2017 at 9:30 AM, Junio C Hamano wrote: > The existing tests only checked how well -relative= work, > without testing --relative (without any value). > > Signed-off-by: Junio C Hamano > --- > t/t4045-diff-relative.sh | 24

Re: [PATCH v2 5/7] diff: use skip-to-optional-val in parsing --relative

On Thu, Dec 7, 2017 at 9:30 AM, Junio C Hamano wrote: > Signed-off-by: Junio C Hamano > --- > diff.c | 7 +++ > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/diff.c b/diff.c > index cd032c6367..e99ac6ec8a 100644 > --- a/diff.c > +++

Re: [PATCH v2] diff: fix --relative without arguments

On Thu, Dec 7, 2017 at 7:26 AM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Recently, commit f7923a5ece00 ("diff: use skip_to_optional_val()&q

Re: git commit file completion recently broke

On Thu, Dec 7, 2017 at 7:24 AM, Junio C Hamano wrote: > Christian Couder writes: > >>> I do think it may make sense for >>> the "short" one to use NULL, like: >>> >>> skip_to_optional_val(arg, "--relative, ) >>> >>> but maybe some other callers

Re: [PATCH] diff: add test showing regression to --relative

On Wed, Dec 6, 2017 at 5:04 PM, Jeff King <p...@peff.net> wrote: > On Wed, Dec 06, 2017 at 04:35:17PM -0800, Jacob Keller wrote: > >> Subject: [PATCH] diff: add test showing regression to --relative > > Since we'd hopefully not ever merge that regression, I think this patch

Re: git commit file completion recently broke

On Wed, Dec 6, 2017 at 4:56 PM, Jeff King <p...@peff.net> wrote: > On Wed, Dec 06, 2017 at 04:38:29PM -0800, Jacob Keller wrote: > >> >> But nope, it looks like the culprit is f7923a5ece (diff: use >> >> skip_to_optional_val(), 2017-12-04), which switch

[PATCH v2] diff: fix --relative without arguments

From: Jacob Keller <jacob.kel...@gmail.com> Recently, commit f7923a5ece00 ("diff: use skip_to_optional_val()", 2017-12-04) changed how we parsed some diff options, preferring skip_to_optional_val instead of a more complex skip_prefix() setup. Unfortunately, this breaks --r

Re: git commit file completion recently broke

On Wed, Dec 6, 2017 at 4:24 PM, Jeff King <p...@peff.net> wrote: > On Wed, Dec 06, 2017 at 07:22:35PM -0500, Jeff King wrote: > >> On Wed, Dec 06, 2017 at 04:01:51PM -0800, Jacob Keller wrote: >> >> > I think I narrowed this down to "git diff-index --nam

[PATCH] diff: add test showing regression to --relative

From: Jacob Keller <jacob.kel...@gmail.com> Signed-off-by: Jacob Keller <jacob.kel...@gmail.com> --- t/t4045-diff-relative.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh index 3950f5034d31..41e4f59b2ffb 100755 --- a/

Re: [PATCH 3/3] diff: use skip_to_opt_val()

On Wed, Dec 6, 2017 at 4:16 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > On Sun, Dec 3, 2017 at 9:04 AM, Christian Couder > <christian.cou...@gmail.com> wrote: >> From: Christian Couder <christian.cou...@gmail.com> >> >> Let's simplify

Re: [PATCH 3/3] diff: use skip_to_opt_val()

On Sun, Dec 3, 2017 at 9:04 AM, Christian Couder wrote: > From: Christian Couder > > Let's simplify diff option parsing using skip_to_opt_val(). > > Signed-off-by: Christian Couder > --- > diff.c | 22

Re: git commit file completion recently broke

On Wed, Dec 6, 2017 at 4:01 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > On Wed, Dec 6, 2017 at 3:53 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> Hi, >> >> I'm still investigating, but thought I'd send an email. I recently >> updated to jch br

Re: git commit file completion recently broke

On Wed, Dec 6, 2017 at 3:53 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > Hi, > > I'm still investigating, but thought I'd send an email. I recently > updated to jch branch, and found that completion for git commit does > not work as expected. > > If I have a git

git commit file completion recently broke

Hi, I'm still investigating, but thought I'd send an email. I recently updated to jch branch, and found that completion for git commit does not work as expected. If I have a git repository with a modified file in a subdirectiory, then git commit produces the name of the subdirectory instead of

Re: submodules and merging (Was: Re: [PATCH 02/30] merge-recursive: Fix logic ordering issue)

On Mon, Dec 4, 2017 at 11:33 AM, Stefan Beller <sbel...@google.com> wrote: > On Sat, Nov 25, 2017 at 9:59 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Sat, Nov 25, 2017 at 2:37 PM, Elijah Newren <new...@gmail.com> wrote: >>> On Wed, Nov 15, 2017

Re: Git stash (or git rev-parse) doesn't inherit the '--work-tree' parameter

On November 29, 2017 11:02:10 PM PST, marc PINHEDE wrote: >Hello guys, > >I don't know if this is a normal behavior, so I'll just explain it >here. > >* Behavior: > >from a directory OUTSIDE my git repo, I can run this command >successfully: >$ git

Re: submodules and merging (Was: Re: [PATCH 02/30] merge-recursive: Fix logic ordering issue)

On Sat, Nov 25, 2017 at 2:37 PM, Elijah Newren <new...@gmail.com> wrote: > On Wed, Nov 15, 2017 at 9:13 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Tue, Nov 14, 2017 at 10:13 AM, Stefan Beller <sbel...@google.com> wrote: > >>> But this line o

Re: submodules and merging (Was: Re: [PATCH 02/30] merge-recursive: Fix logic ordering issue)

On Tue, Nov 14, 2017 at 10:13 AM, Stefan Beller wrote: > Thanks for your reply! > > On Tue, Nov 14, 2017 at 9:17 AM, Elijah Newren wrote: >> On Mon, Nov 13, 2017 at 3:46 PM, Stefan Beller wrote: >>> On Mon, Nov 13, 2017 at 3:39 PM,

Re: [RFD] Long term plan with submodule refs?

On Fri, Nov 10, 2017 at 12:01 PM, Stefan Beller wrote: >> Basically, a workflow where it's easier to have each submodule checked out at master, and we can still keep track of historical relationship of what commit was the submodule at some time ago, but without

Re: [RFD] Long term plan with submodule refs?

On Thu, Nov 9, 2017 at 12:16 PM, Stefan Beller <sbel...@google.com> wrote: > On Wed, Nov 8, 2017 at 10:54 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Wed, Nov 8, 2017 at 4:10 PM, Stefan Beller <sbel...@google.com> wrote: >>>> The relationship is i

Re: [RFD] Long term plan with submodule refs?

On Wed, Nov 8, 2017 at 4:10 PM, Stefan Beller wrote: >> The relationship is indeed currently useful, but if the long term plan >> is to strongly discourage detached submodule HEAD, then I would think >> that these patches are in the wrong direction. (If the long term plan is

Re: [PATCH v1 2/2] log: add option to choose which refs to decorate

On November 3, 2017 8:49:15 PM PDT, Junio C Hamano wrote: >Rafael Ascensão writes: > >Why should this be a special case that burdens users to remember one >more rule? Wouldn't users find "--decorate-refs=refs/tags" useful >and it woulld be shorter and

Re: submodule using revision

On Fri, Nov 3, 2017 at 6:42 AM, gregory grey wrote: > Hi guys. > > Currently git submodule only works with branch of the submodule in > question. Adding a functionality to work with a revision would be > great from my point of view. > > Proposed syntax is as follows: > git

Re: Documentation for git-diff is very difficult to understand for a layman.

Hi, On November 3, 2017 2:43:03 AM PDT, Vladimir Nikishkin wrote: >Hello, honourable GIT developers. > >I would like to kindly ask you to do something with the git-diff >manpage. (https://git-scm.com/docs/git-diff) > >In fact, I wasn't able to understand it even after

Re: [PATCHv2 6/7] builtin/describe.c: describe a blob

On Thu, Nov 2, 2017 at 10:18 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > >> I think both questions are valuable, the first is "which commit last >> had this blob", the second is "which commit first i

Re: [PATCHv3 0/7] git describe blob

On Thu, Nov 2, 2017 at 12:41 PM, Stefan Beller wrote: > Thanks for the discussion on v2[1]. > > Interdiff is below, just fixing minor things. > > We'll keep the original algorithm for now, deferring an improvement on > the algorithm front towards a future developer. > I

Re: [PATCHv2 6/7] builtin/describe.c: describe a blob

On Wed, Nov 1, 2017 at 3:41 PM, Johannes Schindelin wrote: > Hi Stefan, > > On Wed, 1 Nov 2017, Stefan Beller wrote: > >> >> I know id prefer the first commit that introduced the blob. That's >> >> what describing a commit does, it finds the oldest tag prior to the >>

Re: [PATCHv2 6/7] builtin/describe.c: describe a blob

On November 1, 2017 10:59:08 AM PDT, Stefan Beller wrote: >>> Does the code describe a9dbc3f12c as v2.15.0:GIT-VERSION-GEN, or >>> would it always be :? >> >> As the blob is described using this function: >> >> static void process_object(struct object *obj, const char *path,

[PATCH] sequencer: pass absolute GIT_DIR to exec commands

From: Jacob Keller <jacob.kel...@gmail.com> When we replaced the old shell script based interactive rebase in commmit 18633e1a22a6 ("rebase -i: use the rebase--helper builtin", 2017-02-09) we introduced a regression of functionality in that the GIT_DIR would be sent to the environ

Re: [PATCH 3/7] builtin/describe.c: rename `oid` to avoid variable shadowing

On October 30, 2017 5:33:47 PM PDT, Stefan Beller wrote: >The function `describe` has already a variable named `oid` declared at >the beginning of the function for an object id. Do now shadow that Nit, s/now/not/ >variable with a pointer to an object id. > >Signed-off-by:

Re: [PATCH] rebase: exec leaks GIT_DIR to environment

On October 30, 2017 5:46:36 AM PDT, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: >Hi Phillip, > >On Mon, 30 Oct 2017, Phillip Wood wrote: > >> On 30/10/17 06:26, Jacob Keller wrote: >> > On Sun, Oct 29, 2017 at 8:36 PM, Junio C Hamano <gits...@p

Re: [PATCH] rebase: exec leaks GIT_DIR to environment

On Sun, Oct 29, 2017 at 8:36 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > >> I am pretty confident we can fix it > > I am sure we can eventually, but 3 hours is not enough soak time. > > I am inclined to lea

Re: [PATCH] rebase: exec leaks GIT_DIR to environment

On Sun, Oct 29, 2017 at 7:26 PM, Junio C Hamano wrote: > Phillip Wood writes: > >> Just clearing GIT_DIR does not match the behavior of the shell version >> (tested by passing -p to avoid rebase--helper) as that passes GIT_DIR to >> exec commands if

Re: [PATCH] rebase: exec leaks GIT_DIR to environment

On Sun, Oct 29, 2017 at 11:34 AM, Phillip Wood wrote: > > Just clearing GIT_DIR does not match the behavior of the shell version > (tested by passing -p to avoid rebase--helper) as that passes GIT_DIR to > exec commands if it has been explicitly set. I think that users

Re: [PATCH 3/3] builtin/describe: describe blobs

On Sat, Oct 28, 2017 at 10:32 AM, Johannes Schindelin wrote: > Hi Stefan, > > > Nicely done, sir! > > I wonder whether it would make sense to extend this to tree objects while > we are at it, but maybe that's an easy up-for-grabs. > > Thank you very much! > Dscho I'd

Re: [PATCH] rebase: exec leaks GIT_DIR to environment

On Sat, Oct 28, 2017 at 9:00 AM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Jake, > > On Fri, 27 Oct 2017, Jacob Keller wrote: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> I noticed a failure with git rebase interactive mode

[PATCH] rebase: exec leaks GIT_DIR to environment

From: Jacob Keller <jacob.kel...@gmail.com> I noticed a failure with git rebase interactive mode which causes "exec" commands to be run with GIT_DIR set. When GIT_DIR is in the environment, then any command which results in running a git command in a subdirectory will fail becau

Re: [PATCH 0/6] Create Git/Packet.pm

On Wed, Oct 25, 2017 at 10:38 PM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> Note that the correct blib path starts with `C:\BuildAgent\_work` and >> the line >> >> use lib (split(/:/, $ENV{GITPERLLIB})); >> >> splits off the

Re: [PATCH v2] blame: prevent error if range ends past end of file

On Thu, Oct 26, 2017 at 12:01 AM, Isabella Stephens wrote: > If the -L option is used to specify a line range in git blame, and the > end of the range is past the end of the file, at present git will fail > with a fatal error. This commit prevents such behaviour - instead

Re: [PATCH 0/2] color-moved: ignore all space changes by default

On Thu, Oct 26, 2017 at 12:22 AM, Simon Ruderich wrote: > On Wed, Oct 25, 2017 at 03:46:18PM -0700, Stefan Beller wrote: >> On Mon, Oct 23, 2017 at 7:52 PM, Stefan Beller wrote[1]: >>> On Mon, Oct 23, 2017 at 6:54 PM, Junio C Hamano wrote: * As moved-lines display

Re: [PATCH] t0000: check whether the shell supports the "local" keyword

On Thu, Oct 26, 2017 at 1:28 AM, Eric Sunshine wrote: > On Thu, Oct 26, 2017 at 4:18 AM, Michael Haggerty > wrote: >> Add a test balloon to see if we get complaints from anybody who is >> using a shell that doesn't support the "local" keyword. If

Re: [RFE] Add minimal universal release management capabilities to GIT

On October 21, 2017 6:56:51 AM PDT, nicolas.mail...@laposte.net wrote: > > >- Mail original - >De: "Stefan Beller" > >> git tags ? > >Too loosely defined to be relied on by project-agnostic tools. That's >what most tools won't ever try to use those. Anything you will define >around

Re: hot to get file sizes in git log output

On Fri, Oct 20, 2017 at 2:50 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Fri, Oct 20, 2017 at 5:43 PM, Jeff King <p...@peff.net> wrote: >> On Fri, Oct 20, 2017 at 01:44:36PM -0700, Jacob Keller wrote: >>> On Fri, Oct 20, 2017 at 11:12 AM, David Lang &l

Re: hot to get file sizes in git log output

On Fri, Oct 20, 2017 at 11:12 AM, David Lang wrote: > I'm needing to scan through git history looking for the file sizes (looking > for when a particular file shrunk drastically) > > I'm not seeing an option in git log or git whatchanged that gives me the > file size, am I

Re: [PATCH] submodule: correct error message for missing commits.

On Tue, Sep 26, 2017 at 11:27 AM, Stefan Beller wrote: > When a submodule diff should be displayed we currently just add the > submodule objects to the main object store and then e.g. walk the > revision graph and create a summary for that submodule. > > It is possible that we

Re: [PATCH] describe: teach --match to handle branches and remotes

On Mon, Sep 18, 2017 at 4:52 PM, Junio C Hamano wrote: > Max Kirillov writes: > >> --match :: >> Only consider tags matching the given `glob(7)` pattern, >> - excluding the "refs/tags/" prefix. This can be used to avoid >> - leaking private

Re: [PATCH] describe: fix matching to actually match all patterns

On Fri, Sep 15, 2017 at 10:53 PM, Max Kirillov wrote: > `git describe --match` with multiple patterns matches only first pattern. > If it fails, next patterns are not tried. > > Fix it, add test cases and update existing test which has wrong > expectation. > > Signed-off-by: Max

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

On Fri, Sep 15, 2017 at 10:21 AM, Kevin Willford wrote: > From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Thursday, September 14, 2017 11:00 PM >> >> Kevin Willford writes: >> >> > 1. Does this statement, "I only care about the files in this

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

On Tue, Sep 12, 2017 at 4:30 PM, Kevin Willford wrote: > > Sorry. It was not in the sparse-checkout file. > $ git config core.sparsecheckout true > $ echo /i > .git/info/sparse-checkout > $ git checkout -f > was ran in the modified file case as well and "i" was the only

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

On Tue, Sep 12, 2017 at 1:20 PM, Kevin Willford wrote: >> From: Junio C Hamano [mailto:gits...@pobox.com] >> Sent: Monday, September 11, 2017 9:57 PM >> >> Let's imagine a path P that is outside the sparse checkout area. >> And we check out a commit that has P. P would

Re: [idea] File history tracking hints

On Mon, Sep 11, 2017 at 11:11 AM, Stefan Beller wrote: > On Mon, Sep 11, 2017 at 12:11 AM, Pavel Kretov wrote: >> Hi all, >> >> Excuse me if the topic I'm going to raise here has been already discussed >> on the mailing list, forums, or IRC, but I

Re: gitmodules below root directory

On Wed, Sep 6, 2017 at 12:58 PM, Junio C Hamano wrote: > The current gitlink implementation records only the "what commit > from the subproject history is to be checked out at this path?" and > nothing else, by storing a single SHA-1 that happens to be the name > of the commit

Re: Automatically delete branches containing accepted patches?

On Sun, Aug 27, 2017 at 11:44 AM, Lars Schneider wrote: > Hi, > > I have lots of git/git branches and once in a while some patches make it > into git/git master. If this happens I would like to delete my branch > with the patch automatically. That's not easily possible

Re: [PATCH] Doc: clarify that pack-objects makes packs, plural

On Wed, Aug 23, 2017 at 2:22 PM, Jeff King wrote: > On Tue, Aug 22, 2017 at 12:56:25PM -0700, Junio C Hamano wrote: > >> - There should be an update to say max-pack-size is not something >>normal users would ever want. > > Agreed. > >> diff --git

Re: git send-email Cc with cruft not working as expected

On Wed, Aug 23, 2017 at 3:02 AM, Matthieu Moy <g...@matthieu-moy.fr> wrote: >> On Tue, Aug 22, 2017 at 4:30 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >>> Additionally I just discovered that the behavior here changes pretty >>> drastically if you have Emai

Re: [RFC PATCH 1/2] send-email: fix garbage removal after address

On Wed, Aug 23, 2017 at 3:21 AM, Matthieu Moy wrote: > This is a followup over 9d33439 (send-email: only allow one address > per body tag, 2017-02-20). The first iteration did allow writting > > Cc: # garbage > > but did so by matching the regex

Re: git send-email Cc with cruft not working as expected

On Tue, Aug 22, 2017 at 4:18 PM, Stefan Beller <sbel...@google.com> wrote: > On Tue, Aug 22, 2017 at 4:15 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> Hi, >> >> I recently found an issue with git-send-email where it does not >> properly remove the

git send-email Cc with cruft not working as expected

Hi, I recently found an issue with git-send-email where it does not properly remove the cruft of an email address when sending using a Cc: line. The specific example is with a commit containing the following Cc line, Cc: sta...@vger.kernel.org # 4.10+ which is the standard way Linux upstream

Re: [PATCH 0/5] make interpret-trailers useful for parsing

On Thu, Aug 10, 2017 at 11:42 AM, Junio C Hamano wrote: > Jeff King writes: > >>> > The above example made me wonder if we also want a format specifier >>> > to do the above without piping, but it turns out that we already >>> > have "log --format=%(trailers)",

<    1   2   3   4   5   6   7   8   9   10   >