git/git-scm.com GH Issue Tracker

I've went through a bunch of open issues on the git/git-scm.com repo (specifically, everything after #600) and I think the bulk of them can be closed. I've taken the liberty of classifying them as shown below. - Sam # Irrelevant but someone should take a look 693 # Irrelevant to git-scm.com

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 1/4] git-prompt.sh: add submodule indicator

On Mon, Jan 30, 2017 at 7:11 PM, Junio C Hamano wrote: > 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 >

[PATCH] Document the --no-gui option in difftool

Prior to this, the `--no-gui` option was not documented in the manpage. This commit introduces this into the manpage Signed-off-by: Denton Liu --- Documentation/git-difftool.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git

Re: [PATCH v3] parse-remote: remove reference to unused op_prep

Hey Pranit, On Sun, Feb 05, 2017 at 02:45:46AM +0530, Pranit Bauva wrote: > Hey Siddharth, > > On Sat, Feb 4, 2017 at 8:01 PM, Siddharth Kannan > wrote: > > The error_on_missing_default_upstream helper function learned to > > take op_prep argument with 15a147e618

Re: [PATCH/RFC] WIP: log: allow "-" as a short-hand for "previous branch"

Hey Junio, On Sun, Feb 05, 2017 at 04:15:03PM -0800, Junio C Hamano wrote: > Siddharth Kannan writes: > > > @@ -158,6 +158,51 @@ static void cmd_log_init_finish(int argc, const char > > **argv, const char *prefix, > > > > if (quiet) > >

Re: [PATCH/RFC] WIP: log: allow "-" as a short-hand for "previous branch"

Siddharth Kannan writes: > @@ -158,6 +158,51 @@ static void cmd_log_init_finish(int argc, const char > **argv, const char *prefix, > > if (quiet) > rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT; > + > + /* > + * Check if any

Re: In-body from headers ignored

On Sun, Feb 5, 2017 at 3:43 PM, Junio C Hamano wrote: > Liam Breck writes: > >> git format-patch & send-email generate the in-body From header. >> >> git am recognizes it. >> >> git commit & format-patch & send-email ignore it. (The latter two will >>

Re: In-body from headers ignored

Liam Breck writes: > git format-patch & send-email generate the in-body From header. > > git am recognizes it. > > git commit & format-patch & send-email ignore it. (The latter two will > add a new header above an extant one.) Is there a rationale for this? I may be

Re: [PATCH] tag: generate useful reflog message

cornelius.w...@tngtech.com writes: > Now, a reflog message is generated when creating a tag. The message > follows the pattern "commit: " where the subject is taken from > the commit the tag points to. For example: > "6e3a7b3 refs/tags/tag_with_reflog@{0}: commit: Git 2.12-rc0" Because the

[PATCH v2] tag: generate useful reflog message

From: Cornelius Weig When tags are created with `--create-reflog` or with the option `core.logAllRefUpdates` set to 'always', a reflog is created for them. So far, the description of reflog entries for tags was empty, making the reflog hard to understand. For example:

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

On Sun, Feb 5, 2017 at 2:39 AM, Duy Nguyen wrote: > On Sat, Jan 21, 2017 at 2:16 AM, Jacob Keller wrote: >> I would be interested in the code for this.. I'm curious if I can >> adapt it to my use of tmux. > > I stumbled upon this which does mention

In-body from headers ignored

git format-patch & send-email generate the in-body From header. git am recognizes it. git commit & format-patch & send-email ignore it. (The latter two will add a new header above an extant one.) Is there a rationale for this? If not, maybe this is a bug?

[PATCH] tag: generate useful reflog message

From: Cornelius Weig When tags are created with `--create-reflog` or with the option `core.logAllRefUpdates` set to 'always', a reflog is created for them. So far, the description of reflog entries for tags was empty, making the reflog hard to understand. For example:

[PATCH] difftool: fix bug when printing usage

"git difftool -h" reports an error: fatal: BUG: setup_git_env called without repository Defer repository setup so that the help option processing happens before the repository is initialized. Add tests to ensure that the basic usage works inside and outside of a repository.

[PATCH v3 2/5] stash: introduce push verb

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 given as an argument to the -m option. This allows us to have pathspecs at the end of the command

[PATCH v3 1/5] Documentation/stash: remove mention of git reset --hard

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. In addition it's not quite true for git stash -p, and will not be true when a filename argument to limit the stash to a

[PATCH v3 0/5] stash: support pathspec argument

Thanks Junio for the review in the previous round. Changes since v2: - $IFS should now be supported by using "$@" everywhere instead of using a $files variable. - Added a new patch showing the old behaviour of git stash create is preserved. - Rephrased the documentation - Simplified the

[PATCH v3 3/5] stash: add test for the create command line arguments

Currently there is no test showing the expected behaviour of git stash create's command line arguments. Add a test for that to show the current expected behaviour and to make sure future refactorings don't break those expectations. Signed-off-by: Thomas Gummerer ---

[PATCH v3 4/5] stash: introduce new format create

git stash create currently supports a positional argument for adding a message. This is not quite in line with how git commands usually take comments (using a -m flag). Add a new syntax for adding a message to git stash create using a -m flag. This is with the goal of deprecating the old style

[PATCH v3 5/5] stash: teach 'push' (and 'create') to honor pathspec

While working on a repository, it's often helpful to stash the changes of a single or multiple files, and leave others alone. Unfortunately git currently offers no such option. git stash -p can be used to work around this, but it's often impractical when there are a lot of changes over multiple

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

On Fri, Feb 03, 2017 at 06:56:17PM -0800, 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: git-scm.com status report

Hey Peff, On Thu, Feb 2, 2017 at 8:03 AM, Jeff King wrote: > ## What's on the site > > We have the domains git-scm.com and git-scm.org (the latter we've had > for a while). They both point to the same website, which has general > information about Git, including: Since we have an

Re: Git clonebundles

On Sat, Feb 4, 2017 at 6:39 PM, Shawn Pearce wrote: > On Mon, Jan 30, 2017 at 11:00 PM, Stefan Saasen wrote: >> >> Bitbucket recently added support for Mercurial’s clonebundle extension >>

Re: [PATCH/RFC] WIP: log: allow "-" as a short-hand for "previous branch"

Hey Siddharth, On Sun, Feb 5, 2017 at 6:27 PM, Siddharth Kannan wrote: > Search and replace "-" (written in the context of a branch name) in the > argument > list with "@{-1}". As per the help text of git rev-list, this includes the > following four > cases: > >

Re: [RFC] Add support for downloading blobs on demand

(Sorry for the late reply and thanks to Dscho for pointing me to this thread.) On Tue, Jan 17, 2017 at 10:50 PM, Ben Peart wrote: >> From: Jeff King [mailto:p...@peff.net] >> On Fri, Jan 13, 2017 at 10:52:53AM -0500, Ben Peart wrote: >> >> > Clone and fetch will pass a

[PATCH/RFC] WIP: log: allow "-" as a short-hand for "previous branch"

Search and replace "-" (written in the context of a branch name) in the argument list with "@{-1}". As per the help text of git rev-list, this includes the following four cases: a. "-" b. "^-" c. "-..other-branch-name" or "other-branch-name..-" d. "-...other-branch-name" or

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

On 01/30, Junio C Hamano wrote: > 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

[PATCH] p5302: create repositories for index-pack results explicitly

Before 7176a314 (index-pack: complain when --stdin is used outside of a repo) index-pack silently created a non-existing target directory; now the command refuses to work unless it's used against a valid repository. That causes p5302 to fail, which relies on the former behavior. Fix it by setting

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

On 01/30, Junio C Hamano wrote: > 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

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

On Sat, Jan 21, 2017 at 2:16 AM, Jacob Keller wrote: > I would be interested in the code for this.. I'm curious if I can > adapt it to my use of tmux. I stumbled upon this which does mention about git SHA-1. Maybe you'll find it useful. Haven't tried it out though.

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

On Fri, Feb 03, 2017 at 10:23:51PM -0800, Denton Liu wrote: > On Fri, Feb 03, 2017 at 09:58:09PM -0800, Jacob Keller wrote: > > 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

Re: [PATCH] Add --gui option to mergetool

On Fri, Feb 03, 2017 at 10:43:03PM -0800, Denton Liu wrote: > * fix the discrepancy between difftool and mergetool where > the former has the --gui flag and the latter does not by adding the > functionality to mergetool Please avoid bullet points in commit messages when a simple paragraph