[PATCH v5 1/3] diff.c: remove output_prefix_length field

From: Junio C Hamano "diff/log --stat" has a logic that determines the display columns available for the diffstat part of the output and apportions it for pathnames and diffstat graph automatically. 5e71a84a (Add output_prefix_length to diff_options, 2012-04-16) added the

[PATCH v5 2/3] diff: add --diff-line-prefix option for passing in a prefix

From: Jacob Keller <jacob.kel...@gmail.com> Add an option to pass additional prefix to be displayed before diff output. This feature will be used in a following patch to output correct --graph prefix when using a child_process/run_command interface for submodules. The prefix shall come

Re: [PATCH v5 2/3] diff: add --diff-line-prefix option for passing in a prefix

On Fri, Aug 12, 2016 at 2:15 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> The prefix shall come first prior to any other prefix associated with >> the --graph option or other source. >> >> Add test

Re: [PATCH v3 2/2] diff: add SUBMODULE_DIFF format to display submodule diff

On Wed, Aug 10, 2016 at 3:05 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> @@ -2305,6 +2311,15 @@ static void builtin_diff(const char *name_a, >> struct strbuf header = STRBUF_INIT; >> const ch

Re: [PATCH v3 1/2] diff: add --line-prefix option for passing in a prefix

On Wed, Aug 10, 2016 at 2:58 PM, Junio C Hamano wrote: > You might be envisioning a future enhancement where the recursive > one uses not "-Submodule commit A"/"-Submodule commit B", and not > "diff A B", but "log -p A...B" in the submodule, and in such a case, > it might make

Re: [PATCH v3 1/2] diff: add --line-prefix option for passing in a prefix

On Wed, Aug 10, 2016 at 2:58 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> As suggested by Junio, I implemented --line-prefix to enable the graph >> display correctly. This works by a neat trick of adding to t

[PATCH v4 1/2] diff: add --line-prefix option for passing in a prefix

From: Jacob Keller <jacob.kel...@gmail.com> This will be used by a future patch which implements a diff mode for submodule display. Without this, the diff output would incorrectly display when using both -p and --graph during a git-log. Note that the --line-prefix will be displayed first

[PATCH v4 2/2] diff: add SUBMODULE_DIFF format to display submodule diff

From: Jacob Keller <jacob.kel...@gmail.com> Teach git-diff and friends a new format for displaying the difference of a submodule using git-diff inside the submodule project. This allows users to easily see exactly what source changed in a given commit that updates the submodule pointer.

Re: Feature request for automatic worktree checkout

On Mon, Jul 18, 2016 at 11:33 AM, Junio C Hamano wrote: > Ehsan Azarnasab writes: > >> Currently if I have a branch checked out in a work-tree, git-checkout >> will show this error message when checking out that branch: >> >> $ git checkout master >>

Re: [PATCH] revert: clarify seemingly bogus OPT_END repetition

On Tue, Jul 5, 2016 at 1:44 PM, Jeff King wrote: > On Tue, Jul 05, 2016 at 04:28:20PM -0400, Jeff King wrote: > >> I wonder if parse_options_concat should simply allocate a new list >> (after computing the total required size). I guess this is the only >> caller, though, so perhaps

Re: Over-/underquoting, was Re: [PATCH] revert: clarify seemingly bogus OPT_END repetition

On Wed, Jul 6, 2016 at 6:16 AM, Johannes Schindelin wrote: >> Johannes Schindelin venit, vidit, dixit 06.07.2016 09:01: >> OTOH, I often have to look up the original message because people cut >> too much, or because they take one sentence out of context. > > And

Re: git branch doesn't allow me to forcibly delete branch which was checked out in a now-deleted worktree dir

On Fri, Jul 8, 2016 at 7:22 PM, Erik Johnson <paleh...@gmail.com> wrote: > On Fri, Jul 08, 2016 at 05:41:17PM -0700, Jacob Keller wrote: >> It is possible we should update "git branch -d" should perform a >> worktree prune first, since that would enable it t

Re: git branch doesn't allow me to forcibly delete branch which was checked out in a now-deleted worktree dir

On Thu, Jul 7, 2016 at 5:36 PM, Erik Johnson wrote: > I'm not expecting _any_ git branch command to prune worktrees, but a > branch _deletion_ shouldn't fail because git thinks the branch is > checked out in a worktree that doesn't exist anymore. Even in the > scenario where

Re: Fast-forward able commit, otherwise fail

On Fri, Jul 8, 2016 at 3:19 PM, Junio C Hamano wrote: > David Lightle writes: >> In fact, I just noticed that GitLab has built in the functionality I'm >> looking for even, which is what they call "Merge commit with >> semi-linear history" but I'm asking

Re: git branch doesn't allow me to forcibly delete branch which was checked out in a now-deleted worktree dir

On Thu, Jul 7, 2016 at 11:44 AM, Erik Johnson wrote: > % git branch -D archive-extracted-xz > error: Cannot delete branch 'archive-extracted-xz' checked out at > '/home/erik/git/salt/archive-extracted-xz' > % test -d /home/erik/git/salt/archive-extracted-xz || echo "directory

Re: [PATCHv2 0/6] git clone: Marry --recursive and --reference

On Mon, Aug 8, 2016 at 9:08 PM, Stefan Beller wrote: > > v3: > > Thanks to Junios critial questions regarding the design, I took a step back > to look at the bigger picture. > > --super-reference sounds confusing. (what is the super referring to?) > So drop that approach. > >

[PATCH] completion: add completion for --submodule=* diff option

From: Jacob Keller <jacob.kel...@gmail.com> Teach git-completion.bash to complete --submodule= for git commands which take diff options. Also teach completion for git-log to support --diff-algorithms as well. Signed-off-by: Jacob Keller <jacob.kel...@gmail.com> --- contrib/co

[PATCH RFC] diff: add SUBMODULE_DIFF format to display submodule diff

From: Jacob Keller <jacob.kel...@gmail.com> For projects which have frequent updates to submodules it is often useful to be able to see a submodule update commit as a difference. Teach diff's --submodule= a new "diff" format which will execute a diff for the submodule between

Re: [PATCH 8/8] diff: improve positioning of add/delete blocks in diffs

On Wed, Aug 3, 2016 at 3:00 PM, Michael Haggerty wrote: > +/* > + * If a line is indented more than this, get_indent() just returns this > value. > + * This avoids having to do absurd amounts of work for data that are not > + * human-readable text, and also ensures that the

Re: [PATCH v6 1/3] diff.c: remove output_prefix_length field

On Tue, Aug 16, 2016 at 11:03 AM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Junio C Hamano <gits...@pobox.com> > > Thanks. I had quite a many typoes in this one. > > > No need to resend;

Re: storing cover letter of a patch series?

On Mon, Aug 15, 2016 at 8:45 PM, Duy Nguyen <pclo...@gmail.com> wrote: > On Tue, Aug 16, 2016 at 3:46 AM, Philip Oakley <philipoak...@iee.org> wrote: >> From: "Jacob Keller" <jacob.kel...@gmail.com> >> [nip] >>>> >>>> >>&g

Re: [PATCH v6 3/3] diff: add SUBMODULE_DIFF format to display submodule diff

On Tue, Aug 16, 2016 at 11:48 AM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt >> index d5a5b17d5088..f5d693afad6c 100644 >> --- a/Do

Re: [PATCH v6 2/3] graph: add support for --line-prefix on all graph-aware output

On Tue, Aug 16, 2016 at 11:22 AM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> To make this work, we have to fix a few bugs in the graph API that force >> graph_show_commit_msg to be used only when you have a va

Re: storing cover letter of a patch series?

On Mon, Aug 15, 2016 at 5:37 AM, Philip Oakley wrote: > [sorry if this is not the right place to 'drop in'..] > I appreciate there has been a lot of discussion, but it mainly appears to be > about an upstream / integration viewpoint. > > I'd hate it if there was a one size

Re: [PATCH v6 3/3] diff: add SUBMODULE_DIFF format to display submodule diff

On Tue, Aug 16, 2016 at 2:14 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > >>>> + >>>> + if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED) { >>>> + /* >>>> +

Re: [PATCH] reset: add an example of how to split a commit into two

On Fri, Feb 3, 2017 at 10:59 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >>> +$ git reset -p HEAD^<1> >> >> For good practice, perhaps put "git diff --cached HEAD^" before "git commit". >> >> I tend to avoid "reset -p" and

[PATCH v2] reset: add an example of how to split a commit into two

From: Jacob Keller <jacob.kel...@gmail.com> It is often useful to break a commit into multiple parts that are more logical separations. This can be tricky to learn how to do without the brute-force method if re-writing code or commit messages from scratch. Add a section to the git

[PATCH] reset: add an example of how to split a commit into two

From: Jacob Keller <jacob.kel...@gmail.com> It is sometimes useful to break a commit into parts to more logically show how the code changes. There are many possible ways to achieve this result, but one simple and powerful one is to use git reset -p. Add an example to the documentation s

Re: [PATCH] Remove --no-gui option from difftool usage string

On Fri, Feb 3, 2017 at 6:56 PM, Denton Liu wrote: > The --no-gui option not documented in the manpage, nor is it actually > used in the source code. This change removes it from the usage help > that's printed. > > Signed-off-by: Denton Liu > --- >

Re: [PATCH 00/12] completion: speed up refs completion

On Thu, Feb 2, 2017 at 8:15 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > On Thu, Feb 2, 2017 at 6:53 PM, SZEDER Gábor <szeder@gmail.com> wrote: >> This series speeds up refs completion for large number of refs, partly >> by giving up disambiguating ambiguou

Re: [PATCH] color_parse_mem: allow empty color spec

On Tue, Jan 31, 2017 at 4:21 PM, Jeff King wrote: > On Tue, Jan 31, 2017 at 02:45:40PM -0800, Junio C Hamano wrote: > >> * nd/log-graph-configurable-colors (2017-01-23) 3 commits >> (merged to 'next' on 2017-01-23 at c369982ad8) >> + log --graph: customize the graph lines with

Re: What's cooking in git.git (Feb 2017, #02; Mon, 6)

On Mon, Feb 6, 2017 at 4:24 PM, SZEDER Gábor wrote: >> * sg/completion-refs-speedup (2017-02-06) 13 commits >> - squash! completion: fill COMPREPLY directly when completing refs >> - completion: fill COMPREPLY directly when completing refs >> - completion: list only

Re: [PATCH 00/12] completion: speed up refs completion

On Mon, Feb 6, 2017 at 11:36 AM, SZEDER Gábor <szeder@gmail.com> wrote: > On Mon, Feb 6, 2017 at 7:31 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Fri, Feb 3, 2017 at 7:15 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >>> I haven't had a chance

Re: ``git clean -xdf'' and ``make clean''

On Tue, Feb 7, 2017 at 7:07 AM, Cornelius Weig wrote: > On 02/07/2017 03:17 PM, Hongyi Zhao wrote: >> Hi all, >> >> In order to delete all of the last build stuff, does the following two >> methods equivalent or not? >> >> ``git clean -xdf'' and ``make clean'' > > No,

Re: [PATCH 00/12] completion: speed up refs completion

On Thu, Feb 2, 2017 at 6:53 PM, SZEDER Gábor wrote: > This series speeds up refs completion for large number of refs, partly > by giving up disambiguating ambiguous refs (patch 6) and partly by > eliminating most of the shell processing between 'git for-each-ref' > and

Re: [PATCH 00/12] completion: speed up refs completion

On Fri, Feb 3, 2017 at 7:15 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > I haven't had a chance to further investigate, but I tried this series > out (from your github) and it appears that this series (or the > previous series for __gitdir work) breaks "git log" re

Re: Request re git status

On Tue, Feb 7, 2017 at 10:13 PM, Duy Nguyen <pclo...@gmail.com> wrote: > On Wed, Feb 8, 2017 at 2:18 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> Personally, I think that the fact that Git forces the user to think >> about it in terms of "oh I have to

Re: Request re git status

On Tue, Feb 7, 2017 at 6:54 AM, Samuel Lijin wrote: > On Mon, Feb 6, 2017 at 6:45 PM, Phil Hord wrote: >> On Mon, Feb 6, 2017 at 3:36 PM Ron Pero wrote: >>> I almost got bit by git: I knew there were changes on the remote >>> server,

Re: [PATCH/TOY] Shortcuts to quickly refer to a commit name with keyboard

On Sun, Feb 5, 2017 at 2:39 AM, Duy Nguyen <pclo...@gmail.com> wrote: > On Sat, Jan 21, 2017 at 2:16 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> I would be interested in the code for this.. I'm curious if I can >> adapt it to my use of tmux. > > I stum

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

On Sun, Feb 5, 2017 at 8:23 PM, Stefan Beller wrote: > > (unrelated side note:) > At GitMerge facebook presented their improvements on mercurial > and one of the things was "hg absorb". It would take the dirty hunks/lines > of the working tree and amend them into the "stack of

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: Force Confirmation for Dropping Changed Lines

On Wed, Jan 25, 2017 at 2:16 PM, Hilco Wijbenga wrote: > How can I force Git to not assume my change to the first line is "redundant"? > My guess is that you probably want a custom merge driver for your file types. That's where I would look initially. Thanks, Jake >

Re: Force Confirmation for Dropping Changed Lines

On Wed, Jan 25, 2017 at 3:57 PM, Hilco Wijbenga <hilco.wijbe...@gmail.com> wrote: > On 25 January 2017 at 15:46, Junio C Hamano <gits...@pobox.com> wrote: >> Jacob Keller <jacob.kel...@gmail.com> writes: >> >>>> Mmm, that sounds complex. The "my-

Re: merge maintaining history

On Wed, Jan 25, 2017 at 4:31 PM, David J. Bakeman wrote: > OK so what I've done so far is to clone the original then I added > another remote connected to new repo. Then I did git merge newrepo. It > did a bunch of stuff that flashed by really fast and then reported a >

Re: Force Confirmation for Dropping Changed Lines

On Wed, Jan 25, 2017 at 2:51 PM, Hilco Wijbenga <hilco.wijbe...@gmail.com> wrote: > On 25 January 2017 at 14:24, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Wed, Jan 25, 2017 at 2:16 PM, Hilco Wijbenga >> <hilco.wijbe...@gmail.com> wrote: >>> H

Re: [PATCH 4/5] revision.c: refactor ref selection handler after --exclude

On Wed, Jan 25, 2017 at 4:50 AM, Nguyễn Thái Ngọc Duy wrote: > Behavior change: "--exclude --blah --remotes" will not exclude remote > branches any more. Only "--exclude --remotes" does. > > This is because --exclude is going to have a new friend --decorate-reflog > who haves

Re: Force Confirmation for Dropping Changed Lines

On Wed, Jan 25, 2017 at 6:32 PM, Junio C Hamano wrote: > Where did you get that "unset" from? If that is this paragraph in > Documentation/gitattributes.txt: > Ok so that whole section of documentation is very confusing to me. Maybe it could be improved for more readability.

Re: [PATCH] log: new option decorate reflog of remote refs

On Fri, Jan 20, 2017 at 6:30 AM, Jeff King wrote: >> Imposing order between options could cause confusion, I think, if you >> remove --decorate-reflog leaving --remotes on by accident, now you get >> --remotes with a new meaning. We could go with something like >>

Re: [PATCH 4/5] revision.c: refactor ref selection handler after --exclude

On Wed, Jan 25, 2017 at 1:27 PM, Jeff King wrote: > On Wed, Jan 25, 2017 at 03:57:18PM -0500, Jeff King wrote: > >> IOW, the ref-selector options build up until a group option is given, >> which acts on the built-up options (over that group) and then resets the >> built-up options.

Re: [PATCH 12/15] unpack-trees: check if we can perform the operation for submodules

On Tue, Feb 21, 2017 at 2:16 PM, Stefan Beller <sbel...@google.com> wrote: > On Fri, Feb 17, 2017 at 10:42 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller <sbel...@google.com> wrote: >>> + if (

Re: [PATCH 12/15] unpack-trees: check if we can perform the operation for submodules

On Tue, Feb 21, 2017 at 3:44 PM, Stefan Beller <sbel...@google.com> wrote: > On Tue, Feb 21, 2017 at 3:35 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Tue, Feb 21, 2017 at 2:16 PM, Stefan Beller <sbel...@google.com> wrote: >>> On Fri, Feb 17, 2017

Re: [PATCH] git-check-ref-format: fix typo in man page

On Sat, Feb 18, 2017 at 2:47 PM, Damien Regad wrote: > > --- > Documentation/git-check-ref-format.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/git-check-ref-format.txt > b/Documentation/git-check-ref-format.txt > index

Re: Git bisect does not find commit introducing the bug

On Sun, Feb 19, 2017 at 11:05 AM, Alex Hoffman wrote: >> Then you must adjust your definition of "good": All commits that do not have >> the feature, yet, are "good": since they do not have the feature in the >> first place, they cannot have the breakage that you found in the

Re: [PATCH 08/15] submodules: introduce check to see whether to touch a submodule

On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller wrote: > In later patches we introduce the --recurse-submodule flag for commands > that modify the working directory, e.g. git-checkout. > > It is potentially expensive to check if a submodule needs an update, > because a common

Re: [PATCH 12/15] unpack-trees: check if we can perform the operation for submodules

On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller wrote: > + if (is_active_submodule_with_strategy(ce, SM_UPDATE_UNSPECIFIED)) Here, and in other cases where we use is_active_submodule_with_strategy(), why do we only ever check SM_UPDATE_UNSPECIFIED? It seems really weird

Re: [PATCH 06/15] update submodules: add submodule config parsing

On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller wrote: > Similar to b33a15b08 (push: add recurseSubmodules config option, > 2015-11-17) and 027771fcb1 (submodule: allow erroneous values for the > fetchRecurseSubmodules option, 2015-08-17), we add submodule-config code > that is

Re: [RFCv4 PATCH 00/14] Checkout aware of Submodules!

On Thu, Feb 16, 2017 at 2:00 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Integrate updating the submodules into git checkout,... > > It was more or less a pleasant read, once I decided to pretend that > I were a machine who uses identifiers only

Re: [PATCH 08/15] submodules: introduce check to see whether to touch a submodule

On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller wrote: > +int touch_submodules_in_worktree(void) > +{ > + /* > +* Update can't be "none", "merge" or "rebase", > +* treat any value as OFF, except an explicit ON. > +*/ > + return

Re: There are too many unreachable loose objects

On Thu, Feb 16, 2017 at 1:58 PM, Hilco Wijbenga wrote: > Hi all, > > Whenever I run "git push --force(-with-lease)" I get a variation of > > Counting objects: 187, done. > Delta compression using up to 12 threads. > Compressing objects: 100% (126/126), done. > Writing

Re: [RFCv4 PATCH 00/14] Checkout aware of Submodules!

On Thu, Feb 16, 2017 at 2:56 PM, Stefan Beller <sbel...@google.com> wrote: > On Thu, Feb 16, 2017 at 2:54 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Thu, Feb 16, 2017 at 2:00 PM, Junio C Hamano <gits...@pobox.com> wrote: >>> Stefan Beller <sbel...

Re: SHA1 collisions found

On Fri, Feb 24, 2017 at 5:21 PM, Jeff King wrote: > On Fri, Feb 24, 2017 at 05:00:55PM -0800, David Lang wrote: > >> On Fri, 24 Feb 2017, Jeff King wrote: >> >> > >> > So I'd much rather see strong rules like: >> > >> > 1. Once a repo has flag-day switched over to the new hash

Re: SHA1 collisions found

On Fri, Feb 24, 2017 at 5:39 PM, David Lang wrote: > On Fri, 24 Feb 2017, Jeff King wrote: > >>> what if they are forks of each other? (LEDE and OpenWRT, or just >>> linux-kernel and linux-kernel-stable) >> >> >> Once one flips, the other one needs to flip to, or can't interact

Re: [RFC PATCH] show decorations at the end of the line

On Sun, Feb 19, 2017 at 2:33 PM, Linus Torvalds wrote: > On Fri, Feb 17, 2017 at 9:27 PM, Junio C Hamano wrote: >> >> I just got bitten by a fallout. I have >> >> $ git recent --help >> `git recent' is aliased to `log --oneline

Re: [PATCH 06/15] update submodules: add submodule config parsing

On Tue, Feb 21, 2017 at 11:42 AM, Stefan Beller <sbel...@google.com> wrote: > On Fri, Feb 17, 2017 at 10:24 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> >> Ok so this function here reads a recurse submodules parameter which is >> a boolean or it can be set

Re: [PATCH v3] reset: add an example of how to split a commit into two

On Thu, Feb 16, 2017 at 11:49 AM, Junio C Hamano <gits...@pobox.com> wrote: > Junio C Hamano <gits...@pobox.com> writes: > >> Jacob Keller <jacob.e.kel...@intel.com> writes: >> >>> The interdiff between v2 and v3 is not really worth showing since I &g

[PATCH v3] reset: add an example of how to split a commit into two

From: Jacob Keller <jacob.kel...@gmail.com> It is often useful to break a commit into multiple parts that are more logical separations. This can be tricky to learn how to do without the brute-force method if re-writing code or commit messages from scratch. Add a section to the git

Re: [PATCH v3 3/5] name-rev: add support to exclude refs by pattern match

On Wed, Jan 18, 2017 at 1:56 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > >> Yes this makes sense. I'm still looking at whether the alternative >> implementation suggested based on the git-log style would make more &

[PATCH v4 4/5] describe: teach --match to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach `--match` to be accepted multiple times, accumulating a list of patterns to match into a string list. Each pattern is inclusive, such that a tag need only match one of the provided patterns to be considered for matching. This extension is

[PATCH v4 3/5] name-rev: add support to exclude refs by pattern match

From: Jacob Keller <jacob.kel...@gmail.com> Extend git-name-rev to support excluding refs which match shell patterns using --exclude. These patterns can be used to limit the scope of refs by excluding any ref that matches one of the --exclude patterns. A ref will only be used for namin

[PATCH v4 0/5] extend git-describe pattern matching

From: Jacob Keller <jacob.kel...@gmail.com> Teach git describe and git name-rev the ability to match multiple patterns inclusively. Additionally, teach these commands to also accept negative patterns to exclude any refs which match. The pattern lists for positive and negative pa

[PATCH v4 2/5] name-rev: extend --refs to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach git name-rev to take multiple --refs stored as a string list of patterns. The list of patterns will be matched inclusively, and each ref only needs to match one pattern to be included. A ref will only be excluded if it does not mat

[PATCH v4 1/5] doc: add documentation for OPT_STRING_LIST

From: Jacob Keller <jacob.kel...@gmail.com> Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST helper", 2011-06-09) added the OPT_STRING_LIST as a way to accumulate a repeated list of strings. However, this was not documented in the api-parse-options documentation. Add docu

[PATCH v4 5/5] describe: teach describe negative pattern matches

From: Jacob Keller <jacob.kel...@gmail.com> Teach git-describe the `--exclude` option which will allow specifying a glob pattern of tags to ignore. This can be combined with the `--match` patterns to enable more flexibility in determining which tags to consider. For example, suppose yo

[PATCH v2 1/5] doc: add documentation for OPT_STRING_LIST

From: Jacob Keller <jacob.kel...@gmail.com> Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST helper", 2011-06-09) added the OPT_STRING_LIST as a way to accumulate a repeated list of strings. However, this was not documented in the api-parse-options documentation. Add docu

[PATCH v2 5/5] describe: teach describe negative pattern matches

From: Jacob Keller <jacob.kel...@gmail.com> Teach git-describe the `--exclude` option which will allow specifying a glob pattern of tags to ignore. This can be combined with the `--match` patterns to enable more flexibility in determining which tags to consider. For example, suppose yo

[PATCH v2 2/5] name-rev: extend --refs to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach git name-rev to take a string list of patterns from --refs instead of only a single pattern. The list of patterns will be matched inclusively, such that a ref only needs to match one pattern to be included. If a ref will only be ex

[PATCH v2 4/5] describe: teach --match to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach `--match` to be accepted multiple times, accumulating a list of patterns to match into a string list. Each pattern is inclusive, such that a tag need only match one of the provided patterns to be considered for matching. This extension is

[PATCH v2 3/5] name-rev: add support to exclude refs by pattern match

From: Jacob Keller <jacob.kel...@gmail.com> Extend name-rev further to support matching refs by adding `--exclude` patterns. These patterns will limit the scope of refs by excluding any ref that matches at least one exclude pattern. Checking the exclude refs shall happen first, before ch

[PATCH v3 0/5] extend git-describe pattern matching

From: Jacob Keller <jacob.kel...@gmail.com> ** v3 fixes a minor typo in one of the test cases, so please ignore v2 I left the interdiff as between v1 and v3 instead of v2 ** Teach git describe and git name-rev the ability to match multiple patterns inclusively. Additionally,

[PATCH v3 3/5] name-rev: add support to exclude refs by pattern match

From: Jacob Keller <jacob.kel...@gmail.com> Extend name-rev further to support matching refs by adding `--exclude` patterns. These patterns will limit the scope of refs by excluding any ref that matches at least one exclude pattern. Checking the exclude refs shall happen first, before ch

[PATCH v3 4/5] describe: teach --match to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach `--match` to be accepted multiple times, accumulating a list of patterns to match into a string list. Each pattern is inclusive, such that a tag need only match one of the provided patterns to be considered for matching. This extension is

[PATCH v3 2/5] name-rev: extend --refs to accept multiple patterns

From: Jacob Keller <jacob.kel...@gmail.com> Teach git name-rev to take a string list of patterns from --refs instead of only a single pattern. The list of patterns will be matched inclusively, such that a ref only needs to match one pattern to be included. If a ref will only be ex

[PATCH v2 0/5] extend git-describe pattern matching

From: Jacob Keller <jacob.kel...@gmail.com> Teach git describe and git name-rev the ability to match multiple patterns inclusively. Additionally, teach these commands to also accept negative patterns to exclude any refs which match. The pattern lists for positive and negative pa

[PATCH v3 5/5] describe: teach describe negative pattern matches

From: Jacob Keller <jacob.kel...@gmail.com> Teach git-describe the `--exclude` option which will allow specifying a glob pattern of tags to ignore. This can be combined with the `--match` patterns to enable more flexibility in determining which tags to consider. For example, suppose yo

[PATCH v3 1/5] doc: add documentation for OPT_STRING_LIST

From: Jacob Keller <jacob.kel...@gmail.com> Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST helper", 2011-06-09) added the OPT_STRING_LIST as a way to accumulate a repeated list of strings. However, this was not documented in the api-parse-options documentation. Add docu

Re: [PATCH 5/5] describe: teach describe negative pattern matches

On Fri, Jan 13, 2017 at 1:31 PM, Johannes Sixt <j...@kdbg.org> wrote: > Am 13.01.2017 um 07:57 schrieb Jacob Keller: >> >> On Thu, Jan 12, 2017 at 10:43 PM, Johannes Sixt <j...@kdbg.org> wrote: >>> >>> When you write >>> >>> gi

Re: [PATCH v3 0/5] extend git-describe pattern matching

On Wed, Jan 18, 2017 at 12:18 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> ** v3 fixes a minor typo in one of the test cases, so please ignore v

Re: [PATCH v3 1/5] doc: add documentation for OPT_STRING_LIST

On Wed, Jan 18, 2017 at 11:45 AM, Junio C Hamano wrote: > > I do not know if it is clear enough that 'option' in the last > sentence is a placeholder. I then wondered if spelling it as > `--no-` would make it a bit clearer, but that is ugly. > To be fair, this is exactly how

Re: [PATCH 5/5] describe: teach describe negative pattern matches

On Wed, Jan 18, 2017 at 4:44 AM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Jake, > > On Tue, 17 Jan 2017, Jacob Keller wrote: > >> On Fri, Jan 13, 2017 at 1:31 PM, Johannes Sixt <j...@kdbg.org> wrote: >> > Am 13.01.2017 um 07:57 schrieb J

Re: [PATCH v3 2/5] name-rev: extend --refs to accept multiple patterns

On Wed, Jan 18, 2017 at 12:04 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Teach git name-rev to take a string list of patterns from --refs ins

Re: [PATCH v3 3/5] name-rev: add support to exclude refs by pattern match

On Wed, Jan 18, 2017 at 12:11 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Extend name-rev further to support matching refs by adding `--exclu

Re: [PATCH v4 2/5] name-rev: extend --refs to accept multiple patterns

On Thu, Jan 19, 2017 at 1:06 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Teach git name-rev to take multiple --refs stored as a string

Re: [RFC for GIT] pull-request: add praise to people doing QA

On Thu, Jan 19, 2017 at 1:20 PM, Jeff King wrote: > On Thu, Jan 19, 2017 at 09:43:45PM +0100, Wolfram Sang wrote: > >> > As to the implementation, I am wondering if we can make this somehow >> > work well with the "trailers" code we already have, instead of >> > inventing yet

Re: [PATCH v4 2/5] name-rev: extend --refs to accept multiple patterns

On Thu, Jan 19, 2017 at 1:06 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Teach git name-rev to take multiple --refs stored as a string

Re: [RFC for GIT] pull-request: add praise to people doing QA

On Thu, Jan 19, 2017 at 4:06 PM, Joe Perches wrote:>> This sounds interesting to me! When I have some more time to take a >> look at this i might see if I can revive it. > > Can the terminology please be standardized to what > was once called bylines? > >

Re: [PATCH/TOY] Shortcuts to quickly refer to a commit name with keyboard

On Fri, Jan 20, 2017 at 8:09 AM, Jeff King wrote: > On Fri, Jan 20, 2017 at 05:22:49PM +0700, Nguyễn Thái Ngọc Duy wrote: > >> OK This patch is horrible. Though the idea is cool and I've found it >> very useful. So here it is. Perhaps the idea may be revised a bit >> that's more

Re: What's cooking in git.git (Jan 2017, #02; Sun, 15)

On Mon, Jan 16, 2017 at 2:00 PM, Jeff King wrote: > On Mon, Jan 16, 2017 at 06:06:35PM +0100, Johannes Schindelin wrote: > >> > And I think that would apply to any input parameter we show via >> > error(), etc, if it is connected to a newline (ideally we would >> >

Re: [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function

On Thu, Aug 18, 2016 at 1:39 PM, Stefan Beller <sbel...@google.com> wrote: > On Thu, Aug 18, 2016 at 1:24 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Thu, Aug 18, 2016 at 12:04 PM, Stefan Beller <sbel...@google.com> wrote: >>> On Wed, Aug 17, 2016 a

Re: [PATCH v7 2/7] graph: add support for --line-prefix on all graph-aware output

From: Jacob Keller <jacob.kel...@gmail.com> On Thu, Aug 18, 2016 at 10:56 AM, Stefan Beller <sbel...@google.com> wrote: > On Wed, Aug 17, 2016 at 5:51 PM, Jacob Keller <jacob.e.kel...@intel.com> > wrote: >> From: Jacob

Re: [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function

On Thu, Aug 18, 2016 at 1:49 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > >>>>> If we were to change those, we could discuss if we want to go with >>>>> full sentences >>>>> all

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