Re: [PATCH 0/1] Introduce a way to create a branch and worktree at the same time

Duy Nguyen writes: >> Granted, "git worktree remove" should be the work horse. But why not have >> two ways to skin the same cat? I, again, would prefer the short 'n sweet >> "git branch -d -w pull-rebase-prefix" invocation. > > If you put effort into making it happen, I'm not

Re: [PATCH v4] commit: add a commit.verbose config variable

[+cc:Roberto Tyley] On Fri, Mar 11, 2016 at 05:45:27AM +0530, Pranit Bauva wrote: > On Fri, Mar 11, 2016 at 4:31 AM, Eric Sunshine > wrote: > > As a convenience to reviewers, please use this area below the "---" > > line to provide links and explain what changed since

Re: [PATCH v2] t/t7502 : drop duplicate test

The older version of this patch : - [v1] http://thread.gmane.org/gmane.comp.version-control.git/288662 The changes between the patches : - Improved the language construct of the commit message - Provided more details about the cited commit in the commit message Regards, Pranit Bauva IIT

Re: [PATCH v7 2/2] pull --rebase: add --[no-]autostash flag

On Wed, Mar 9, 2016 at 12:18 PM, Mehul Jain wrote: > If rebase.autoStash configuration variable is set, there is no way to > override it for "git pull --rebase" from the command line. > > Teach "git pull --rebase" the --[no-]autostash command line flag which > overrides

Re: [PATCH 0/1] Introduce a way to create a branch and worktree at the same time

On Thu, Mar 10, 2016 at 2:21 PM, Johannes Schindelin wrote: > Hi Duy, > > On Thu, 10 Mar 2016, Duy Nguyen wrote: > >> On Thu, Mar 10, 2016 at 6:34 PM, Johannes Schindelin >> wrote: >> > One possible improvement would be to add "/xyz/" to

Re[2]: Possible bug: --ext-diff ignored with --cc in git log

On Thu, 10 Mar 2016 14:33:55 -0800 Junio C Hamano wrote: JCH> Vadim Zeitlin writes: JCH> JCH> > I.e. the JCH> > command "git log --ext-diff -p --cc" still outputs the real diff even for JCH> > the generated files, as if "--ext-diff" were not given. ...

Re: [PATCH 04/19] index-helper: new daemon for caching index and related stuff

On Fri, Mar 11, 2016 at 3:22 AM, David Turner wrote: > Reads (ignoring SHA verification) will be slightly slower (due to the > btree overhead). If, in general, we only had to read part of the > index, that would be faster. But a fair amount of git code is written > to

[PATCH v2] t/t7502 : drop duplicate test

This extra test was introduced erroneously by f9c0181 (t7502: test commit.status, --status and --no-status, 2010-01-13) Signed-off-by: Pranit Bauva --- t/t7502-commit.sh | 5 - 1 file changed, 5 deletions(-) diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index

Re: [PATCH 0/1] Introduce a way to create a branch and worktree at the same time

On Thu, Mar 10, 2016 at 8:21 PM, Johannes Schindelin wrote: > Hi Duy, > > On Thu, 10 Mar 2016, Duy Nguyen wrote: > >> On Thu, Mar 10, 2016 at 6:34 PM, Johannes Schindelin >> wrote: >> > The invention of the `git worktree` command changed

Re: [BUG?] fetch into shallow sends a large number of objects

On Fri, Mar 11, 2016 at 4:40 AM, Jeff King wrote: > On Thu, Mar 10, 2016 at 01:26:08PM -0800, Junio C Hamano wrote: > >> > IMHO, that is the right thing. They asked for "C" as a shallow cut-off >> > point, so anything that is a parent of "C" should be omitted as shallow, >> > too.

Re: [PATCH v4] commit: add a commit.verbose config variable

On Fri, Mar 11, 2016 at 4:31 AM, Eric Sunshine wrote: > Add commit.verbose configuration variable as a convenience > for those who always prefer --verbose. > > or something. Sure! > As a convenience to reviewers, please use this area below the "---" > line to

Re: [PATCH] t/t7502-commit.sh : remove a repeated test

On Fri, Mar 11, 2016 at 4:51 AM, Eric Sunshine wrote: >> t/t7502-commit.sh : remove a repeated test > > Or: > > t7502: drop duplicate test > Sure! >> This extra test was introducted in the commit f9c01817 > > We normally add some parenthetical context when

Re: [PATCH] t/t7502-commit.sh : remove a repeated test

On Thu, Mar 10, 2016 at 5:51 PM, Pranit Bauva wrote: > t/t7502-commit.sh : remove a repeated test Or: t7502: drop duplicate test > This extra test was introducted in the commit f9c01817 We normally add some parenthetical context when mentioning commits: This

[ANNOUNCE] Git v2.8.0-rc2

A release candidate Git v2.8.0-rc2 is now available for testing at the usual places. It is comprised of 459 non-merge commits since v2.7.0, contributed by 60 people, 19 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following

[PATCH] t/t7502-commit.sh : remove a repeated test

This extra test was introducted in the commit f9c01817 Signed-off-by: Pranit Bauva --- t/t7502-commit.sh | 5 - 1 file changed, 5 deletions(-) diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index b39e313..725687d 100755 --- a/t/t7502-commit.sh +++

[ANNOUNCE] Git v2.7.3

The latest maintenance release Git v2.7.3 is now available at the usual places. This is primarily to sync the maintenance track with miscellaneous fixes that are scheduled to be part of upcoming v2.8.0 release. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The

Re: [PATCH v4] commit: add a commit.verbose config variable

> + if (!strcmp(k, "commit.verbose")){ > v3 did this line correctly but you somehow lost the SP between > "){". What happened? I will include the SP between )) and { . > Don't you need a test that status is not broken when the variable is > set? I will include the test for status too. But

Re: [PATCH v4] commit: add a commit.verbose config variable

On Thu, Mar 10, 2016 at 5:12 PM, Pranit Bauva wrote: > Since many people always run the command with this option, it would be > preferrable to specify it in the configuration file instead of passing > the option with `git commit` again and again. Perhaps drop the

Re: [PATCH v4] commit: add a commit.verbose config variable

Pranit Bauva writes: > + if (!strcmp(k, "commit.verbose")){ v3 did this line correctly but you somehow lost the SP between "){". What happened? > diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh > index 2ddf28c..4e123a5 100755 > ---

Re: Bug: git branch -D can be used to delete branch which is currently checked out - Part 2

Fair enough, thank you. I’m going to take a look at the previous threads. I’d also be keen to help working on those issues. > On 11 Mar 2016, at 9:41 AM, Jeff King wrote: > > On Fri, Mar 11, 2016 at 05:30:00AM +1100, Marcus Kida wrote: > >> thank you for the feedback. >> I will

Re: Bug: git branch -D can be used to delete branch which is currently checked out - Part 2

On Fri, Mar 11, 2016 at 05:30:00AM +1100, Marcus Kida wrote: > thank you for the feedback. > I will fix this, test it and send a patch. Unfortunately, I think this issue is a little more complicated. There's some prior discussion in

Re: [PATCH v4] commit: add a commit.verbose config variable

Older versions of this patch can be found at :- [v3] : http://thread.gmane.org/gmane.comp.version-control.git/288634 [v2] : http://thread.gmane.org/gmane.comp.version-control.git/288569 [v1] : http://thread.gmane.org/gmane.comp.version-control.git/287540 The changes with respect to last

Re: Possible bug: --ext-diff ignored with --cc in git log

Vadim Zeitlin writes: > I.e. the > command "git log --ext-diff -p --cc" still outputs the real diff even for > the generated files, as if "--ext-diff" were not given. ... > Is the current behaviour intentional? I see it with all the git versions I > tried (1.7.10, 2.1.0,

[PATCH v4] commit: add a commit.verbose config variable

Since many people always run the command with this option, it would be preferrable to specify it in the configuration file instead of passing the option with `git commit` again and again. Signed-off-by: Pranit Bauva --- Documentation/config.txt | 4

Re: [PATCH v3 2/2] mergetool: honor tempfile configuration when resolving delete conflicts

David Aguilar writes: > Teach resolve_deleted_merge() to honor the mergetool.keepBackup and > mergetool.keepTemporaries configuration knobs. > > This ensures that the worktree is kept pristine when resolving deletion > conflicts with the variables both set to false. > >

Re: git smudge filter fails

Jeff King writes: > On Thu, Mar 10, 2016 at 09:45:19AM -0500, Stephen Morton wrote: > >> I am a bit confused because this is basically the example used in >> ProGit [1] and it is fundamentally broken. In fact, if I understand >> correctly, this means that smudge filters cannot be

Re: [PATCH/RFC v3] add a commit.verbose config variable

I figured it out, It first runs status_init_config(). I might have thought "status" as status of the options and thus I may have edited there. On Fri, Mar 11, 2016 at 3:08 AM, Pranit Bauva wrote: > On Fri, Mar 11, 2016 at 3:04 AM, Junio C Hamano >

Re: [PATCH/RFC v3] add a commit.verbose config variable

Pranit Bauva writes: > On Fri, Mar 11, 2016 at 3:04 AM, Junio C Hamano > wrote: >> But doesn't this belong to git_commit_config(), not >> git_STATUS_config()? Should "commit.verbose" make output from "git >> status" verbose? > > True. It should belong

Re: Sample pre-push hook can crash

Stephen Morton writes: > The sample pre-push hook provided with git [1] will crash if the local > repo is not up to date with the remote as $remote_sha is not present > in the local repo. I'm not sure if this patch is exactly correct, it's > just provided as an

Re: [BUG?] fetch into shallow sends a large number of objects

On Thu, Mar 10, 2016 at 01:26:08PM -0800, Junio C Hamano wrote: > > IMHO, that is the right thing. They asked for "C" as a shallow cut-off > > point, so anything that is a parent of "C" should be omitted as shallow, > > too. It has nothing to do with the numeric depth, which was just the > >

Sample pre-push hook can crash

The sample pre-push hook provided with git [1] will crash if the local repo is not up to date with the remote as $remote_sha is not present in the local repo. I'm not sure if this patch is exactly correct, it's just provided as an example. Given that people are likely crafting their own solutions

Re: Bug: git branch -D can be used to delete branch which is currently checked out - Part 2

Hi Johannes, Hi Junio, here you’ll find a patch to hotfix the “delete-a-branch-you’re-on" issue. As Junio already stated there’s many more places where case (in)sensitivity is not handled correctly but this patch would at least prevent you from deleting the branch you’re currently working on

Re: [BUG?] fetch into shallow sends a large number of objects

On Thu, Mar 10, 2016 at 07:20:20PM +0700, Duy Nguyen wrote: > > + else if (shallows.nr > 0) { > > + struct rev_info revs; > > + struct argv_array av = ARGV_ARRAY_INIT; > > + struct commit *c; > > + int i; > > + > > + argv_array_push(,

Re: git smudge filter fails

On Thu, Mar 10, 2016 at 09:45:19AM -0500, Stephen Morton wrote: > I am a bit confused because this is basically the example used in > ProGit [1] and it is fundamentally broken. In fact, if I understand > correctly, this means that smudge filters cannot be relied upon to > provide any 'keyword

Re: [PATCH] Disown ssh+git and git+ssh

On Wed, Mar 9, 2016 at 4:56 PM, Junio C Hamano wrote: > Eric Sunshine writes: >> It might be helpful to cite some reference to support the claim that >> they are "silly" since it's not necessarily obvious to readers who did >> not following the

Re: [PATCH 0/1] Introduce a way to create a branch and worktree at the same time

On Thu, Mar 10, 2016 at 6:51 AM, Duy Nguyen wrote: > On Thu, Mar 10, 2016 at 6:34 PM, Johannes Schindelin > wrote: >> The invention of the `git worktree` command changed this developer's >> working style dramatically. Rather than switching between

Re: [PATCH 04/19] index-helper: new daemon for caching index and related stuff

On Thu, 2016-03-10 at 18:17 +0700, Duy Nguyen wrote: > On Thu, Mar 10, 2016 at 6:21 AM, Junio C Hamano > wrote: > > Junio C Hamano writes: > > > > > David Turner writes: > > > > > > > From: Nguyễn Thái Ngọc Duy

Re: [PATCH/RFC v3] add a commit.verbose config variable

Older versions of this patch can be found at :- [v2] : http://thread.gmane.org/gmane.comp.version-control.git/288569 [v1] : http://thread.gmane.org/gmane.comp.version-control.git/287540 The changes are : - Remove the concept of override-verbose - Add the git_config_bool to the method

[PATCH/RFC v3] add a commit.verbose config variable

Since many people always run the command with this option, it would be preferrable to specify it in the configuration file instead of passing the option with `git commit` again and again. Signed-off-by: Pranit Bauva --- Documentation/config.txt | 4

Re: Bug: git branch -D can be used to delete branch which is currently checked out

Thank you, I get your point. Well this proposed solution will exceed my current knowledge of the git code at this point. (Which is basically null because I've never built it before) > On 11 Mar 2016, at 5:23 AM, Junio C Hamano wrote: > > Junio C Hamano

Re: Bug: git branch -D can be used to delete branch which is currently checked out - Part 2

Hi Johannes, thank you for the feedback. I will fix this, test it and send a patch. Cheers, Marcus > On 10 Mar 2016, at 11:15 PM, Johannes Schindelin > wrote: > > Hi Marcus, > >> On Thu, 10 Mar 2016, Marcus Kida wrote: >> >> Proposed solution: >> >> Use

Re: Bug: git branch -D can be used to delete branch which is currently checked out

Junio C Hamano writes: > It is a possibility to teach the files backend of refs API that some > filesystems are case insensitive and do something special about them, > but I think in the longer term a more productive solution would be > to use the upcoming "pluggable ref

Re: [PATCH] pull: drop confusing prefix parameter of die_on_unclean_work_tree()

Junio C Hamano writes: > I think this is quite subjective, as I tend to take the presence of > "prefix" to mean "the callee assumes that the caller has gone up to > the root level already", and take the absense of use of "prefix" in > the callee to mean "the callee is working

Re: [PATCH] pull: drop confusing prefix parameter of die_on_unclean_work_tree()

Johannes Schindelin writes: > In cmd_pull(), when verifying that there are no changes preventing a > rebasing pull, we diligently pass the prefix parameter to the > die_on_unclean_work_tree() function which in turn diligently passes it > to the has_unstaged_changes()

Re: Bug: git branch -D can be used to delete branch which is currently checked out

Marcus Kida writes: > Testes on: > > Mac OS X 10.11.3 (El Capitan) using Git 2.6.4 > > Issue: > > git branch -D can be used to delete branch which is currently checked out There are other limitations a filesystem that is incapable of differentiating two files with names

Re: [PATCH] rebase -p: avoid grep on potentailly non-ASCII data

Torsten Bögershausen writes: > On 09.03.16 21:26, Junio C Hamano wrote: >> Anders Kaseorg writes: > [] >> sane_grep () { >> -GREP_OPTIONS= LC_ALL=C grep "$@" >> +GREP_OPTIONS= LC_ALL=C grep @@SANE_TEXT_GREP@@ "$@" >> } >> >> sane_egrep () { >> -

Git subtree stumbles over annotated tags

Hello, today I discovered that it's a bad idea to "git subtree pull" from an annotated tag. This issue got discussed in those two threads: http://comments.gmane.org/gmane.comp.version-control.git/247503 http://comments.gmane.org/gmane.comp.version-control.git/248395 I was under the impression

Re: git smudge filter fails

I am a bit confused because this is basically the example used in ProGit [1] and it is fundamentally broken. In fact, if I understand correctly, this means that smudge filters cannot be relied upon to provide any 'keyword expansion' type tasks because they will all by nature have to query the file

Re: Git Smart HTTP using Nginx

On do, 2016-03-10 at 10:13 -0300, Ben Mezger wrote: > The git-scm.com only uses apache2 as an example of setting Git's > Smart > HTTP, and searching the web for the Nginx's config only gives me old > configs or not-functional configurations. Has anyone managed to get > Smart HTTP to work with

[PATCH] pull: drop confusing prefix parameter of die_on_unclean_work_tree()

In cmd_pull(), when verifying that there are no changes preventing a rebasing pull, we diligently pass the prefix parameter to the die_on_unclean_work_tree() function which in turn diligently passes it to the has_unstaged_changes() and has_uncommitted_changes() functions. The casual reader might

Re: [PATCH 0/1] Introduce a way to create a branch and worktree at the same time

Hi Duy, On Thu, 10 Mar 2016, Duy Nguyen wrote: > On Thu, Mar 10, 2016 at 6:51 PM, Duy Nguyen wrote: > >> It gets rather tiresome, and also typo-prone, to call "git branch xyz > >> upstream/master && git worktree add xyz xyz" all the time. > > > > You can actually do "git

Re: [PATCH 0/1] Introduce a way to create a branch and worktree at the same time

Hi Duy, On Thu, 10 Mar 2016, Duy Nguyen wrote: > On Thu, Mar 10, 2016 at 6:34 PM, Johannes Schindelin > wrote: > > The invention of the `git worktree` command changed this developer's > > working style dramatically. Rather than switching between branches all > > the

Git Smart HTTP using Nginx

Hi all, The git-scm.com only uses apache2 as an example of setting Git's Smart HTTP, and searching the web for the Nginx's config only gives me old configs or not-functional configurations. Has anyone managed to get Smart HTTP to work with Nginx and could give me a sample of the .conf? Regards,

Re: [BUG?] fetch into shallow sends a large number of objects

On Tue, Mar 08, 2016 at 08:25:24AM -0500, Jeff King wrote: > I think this patch does roughly the right thing: > > diff --git a/upload-pack.c b/upload-pack.c > index 4859535..da76f70 100644 > --- a/upload-pack.c > +++ b/upload-pack.c > @@ -833,12 +833,41 @@ static void receive_needs(void) >

Re: Bug: git branch -D can be used to delete branch which is currently checked out - Part 2

Hi Marcus, On Thu, 10 Mar 2016, Marcus Kida wrote: > Proposed solution: > > Use `strcasecmp`, `stricmp`, `strcmpi` here: > https://github.com/git/git/blob/f02fbc4f9433937ee0463d0342d6d7d97e1f6f1e/builtin/branch.c#L218 > > Not sure if/which one of this will work on POSIX as well as MS too

Re: [PATCH 0/1] Introduce a way to create a branch and worktree at the same time

On Thu, Mar 10, 2016 at 6:51 PM, Duy Nguyen wrote: >> It gets rather tiresome, and also typo-prone, to call "git branch xyz >> upstream/master && git worktree add xyz xyz" all the time. > > You can actually do "git worktree -b xyz xyz upstream/master" for the > same effect.

Re: [PATCH 0/1] Introduce a way to create a branch and worktree at the same time

On Thu, Mar 10, 2016 at 6:34 PM, Johannes Schindelin wrote: > The invention of the `git worktree` command changed this developer's > working style dramatically. Rather than switching between branches all > the time, topic branches are created and checked out in

[PATCH 1/1] branch: allow conveniently adding new worktrees for new branches

With the newly-introduced --worktree option, after a new branch was created we will add a corresponding new worktree with the same name automatically. Signed-off-by: Johannes Schindelin --- Documentation/git-branch.txt | 5 +++-- builtin/branch.c | 27

[PATCH 0/1] Introduce a way to create a branch and worktree at the same time

The invention of the `git worktree` command changed this developer's working style dramatically. Rather than switching between branches all the time, topic branches are created and checked out in newly-added worktrees, to be reworked and refined until the topic branch is either merged into

Re: [PATCH 04/19] index-helper: new daemon for caching index and related stuff

On Thu, Mar 10, 2016 at 6:21 AM, Junio C Hamano wrote: > Junio C Hamano writes: > >> David Turner writes: >> >>> From: Nguyễn Thái Ngọc Duy >>> >>> Instead of reading the index from disk and worrying about disk

Re: [PATCH 01/19] trace.c: add GIT_TRACE_PACK_STATS for pack usage statistics

On Thu, Mar 10, 2016 at 7:05 AM, David Turner wrote: > On Wed, 2016-03-09 at 14:58 -0800, Junio C Hamano wrote: >> David Turner writes: > ... >> > trace_stats() is intended for GIT_TRACE_*_STATS variable group and >> > GIT_TRACE_PACK_STATS is

Re: Change in .gitignore handling: intended or bug?

On Thu, Mar 10, 2016 at 7:59 AM, Junio C Hamano wrote: > In any case, back to "on topic" part again; I couldn't come up with > a better rewrite using named rules (partly because you need to > clearly define each rule before referring them, and some of the > rules are temporary

Re: [RFC/PATCH 01/48] builtin/apply: avoid parameter shadowing 'p_value' global

On Thu, Mar 10, 2016 at 1:54 AM, Duy Nguyen wrote: > On Thu, Mar 10, 2016 at 6:27 AM, Junio C Hamano wrote: >> Christian Couder writes: >> >>> Signed-off-by: Christian Couder >>> --- >>> builtin/apply.c

[PATCH 3/3] contrib/subtree: list --resolve gets symbolic refs

As the 'list' command finds commit ids for subtrees injected into the checked out branch the --resolve flag tries to look up the repositories at 'git-subtree-repo' and retrive the symbolic refs associated with the commit ids found. Example: $ git-subtree.sh list --resolve vim-airline

[PATCH 2/3] contrib/subtree: new list command to list subtrees

Example output: $ git subtree list .vim/bundle/fireplace https://github.com/tpope/vim-fireplace.git b999b0 Signed-off-by: Nicola Paolucci --- contrib/subtree/git-subtree.sh | 54 ++ contrib/subtree/t/t7900-subtree.sh | 18

[PATCH 0/3] subtree: add 'git-subtree-repo' and list command

To my knowledge 'git subtree' currently lacks a way to track where injected repositories come from originally. Adding this information allows for useful extensions to the command and makes it easier to use subtrees to track external dependencies. In this patch series I propose to add a

[PATCH v3 1/3] contrib/subtree: 'add' stores 'git-subtree-repo'

Git-subtree operations 'add' and 'pull', when called with the parameter will add this to the commit message: git-subtree-repo: Other operations that don't have the information, like 'merge' or 'add' without are unchanged. Users with such a workflow will be on their own with the --message

Re: [RFC/PATCH 00/48] Libifying git apply

On Thu, Mar 10, 2016 at 12:48 AM, Christian Couder wrote: > This is a patch series about libifying "git apply" functionality, to > be able to use this functionality in "git am" without spawning new > processes. This should make "git am" and "git rebase" significantly >

Re: [PATCH] http: honor no_http env variable to bypass proxy

2016-03-07 21:33 GMT+01:00 Junio C Hamano : > Junio C Hamano writes: > > Second call for help. I hate having to revert 30f302f7 (Merge > branch 'kf/http-proxy-auth-methods', 2016-02-03) this late in the > cycle. Ok. I made the original merge commit for

Re: [PATCH] http: honor no_http env variable to bypass proxy

2016-02-29 16:16 GMT+01:00 Jiang Xin : > From: Jiang Xin > > Curl and its families honor several proxy related environment variables: > > * http_proxy and https_proxy define proxy for http/https connections. > * no_proxy (a comma separated hosts)

Bug: git branch -D can be used to delete branch which is currently checked out - Part 2

Proposed solution: Use `strcasecmp`, `stricmp`, `strcmpi` here: https://github.com/git/git/blob/f02fbc4f9433937ee0463d0342d6d7d97e1f6f1e/builtin/branch.c#L218 Not sure if/which one of this will work on POSIX as well as MS too though. Thank you. Cheers, Marcus-- To unsubscribe from this list:

Re: [RFC/PATCH 04/48] builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()

On Wed, Mar 9, 2016 at 11:55 PM, Stefan Beller wrote: > On Wed, Mar 9, 2016 at 9:48 AM, Christian Couder > wrote: > > Some words in the commit message would be nice here as this is one of > the patches, > which isn't "obviously" a good thing to to.

Bug: git branch -D can be used to delete branch which is currently checked out

Testes on: Mac OS X 10.11.3 (El Capitan) using Git 2.6.4 Issue: git branch -D can be used to delete branch which is currently checked out Steps to reproduce: inside a git repository: $ git checkout -b feature/myAwesomeFeature -> you end up in feature/myAwesomeFeature branch $ git checkout