Re: Doc/SubmittingPatches: re-phrashing a sentence about alternate solutions (was Re: [PATCH] Makefile: make NO_ICONV really mean "no iconv")

2018-06-17 Thread Jeff King
On Sun, Jun 17, 2018 at 11:55:33PM +0530, Kaartic Sivaraam wrote: > On Sun, 2018-06-17 at 14:00 -0400, Eric Sunshine wrote: > > Whether or not to talk about alternate solutions in the commit message > > is a judgment call. Same for deciding what belongs in the commit > > message proper and what

Re: OAuth2 support in git?

2018-06-17 Thread Jeff King
On Sun, Jun 17, 2018 at 01:37:24PM +0200, Johannes Schindelin wrote: > > If it's just a custom Authorization header, we should be able to support > > it with existing curl versions without _too_ much effort. > > Indeed. Because it is already implemented: > > git -c

need for `git submodule update` over `git pull --recurse-submodules`?

2018-06-17 Thread Shriramana Sharma
Hello. I've read [this similar question on superuser](https://superuser.com/questions/852019/git-submodule-foreach-git-pull-origin-master-vs-git-pull-recursive-submodules) but I feel my question is more basic: >From the `git pull` manpage: git pull runs git fetch with the given parameters

Re: [RFC PATCH 3/3] git-rebase.sh: make git-rebase--interactive the default

2018-06-17 Thread Johannes Schindelin
Hi Elijah, On Sat, 9 Jun 2018, Elijah Newren wrote: > On Sat, Jun 9, 2018 at 3:11 PM, Johannes Schindelin > wrote: > > On Thu, 7 Jun 2018, Elijah Newren wrote: > > > >> am-based rebases suffer from an reduced ability to detect directory > >> renames upstream, which is fundamental to the fact

Re: [PATCH v2] sequencer: do not squash 'reword' commits when we hit conflicts

2018-06-17 Thread Johannes Schindelin
Hi Phillip, On Sun, 17 Jun 2018, Phillip Wood wrote: > On 17/06/18 06:37, Elijah Newren wrote: > > Ever since commit 18633e1a22 ("rebase -i: use the rebase--helper builtin", > > 2017-02-09), when a commit marked as 'reword' in an interactive rebase > > has conflicts and fails to apply, when the

Re: [PATCH v2] sequencer: do not squash 'reword' commits when we hit conflicts

2018-06-17 Thread Johannes Schindelin
Hi Elijah, On Sat, 16 Jun 2018, Elijah Newren wrote: > Ever since commit 18633e1a22 ("rebase -i: use the rebase--helper builtin", > 2017-02-09), when a commit marked as 'reword' in an interactive rebase > has conflicts and fails to apply, when the rebase is resumed that commit > will be squashed

Herzliche Glückwünsche!!!

2018-06-17 Thread Oxfam International
Herzliche Glückwünsche! Ihre E-Mail hat Ihnen als Community eine Summe von € 1.000.000,00 eingebracht. Antworten für Details.

Doc/SubmittingPatches: re-phrashing a sentence about alternate solutions (was Re: [PATCH] Makefile: make NO_ICONV really mean "no iconv")

2018-06-17 Thread Kaartic Sivaraam
On Sun, 2018-06-17 at 14:00 -0400, Eric Sunshine wrote: > Whether or not to talk about alternate solutions in the commit message > is a judgment call. Same for deciding what belongs in the commit > message proper and what belongs in the "commentary" section of a > patch. A patch author should

Re: [PATCH] Makefile: make NO_ICONV really mean "no iconv"

2018-06-17 Thread Eric Sunshine
On Sun, Jun 17, 2018 at 1:32 PM Kaartic Sivaraam wrote: > On Friday 15 June 2018 01:13 PM, Eric Sunshine wrote: > > On Fri, Jun 15, 2018 at 2:58 AM Simon Ruderich wrote: > >> Should we put the part about MacOS's make into the commit > >> message? Seems like relevant information for future

Re: [PATCH] Makefile: make NO_ICONV really mean "no iconv"

2018-06-17 Thread Kaartic Sivaraam
On Friday 15 June 2018 01:13 PM, Eric Sunshine wrote: > On Fri, Jun 15, 2018 at 2:58 AM Simon Ruderich wrote: >> On Thu, Jun 14, 2018 at 10:25:03PM -0400, Eric Sunshine wrote: >>> This patch is extra noisy due to the indentation change. Viewing it with >>> "git diff -w" helps. An alternative to

Re: [RFC PATCH v2 1/7] git-rebase.txt: document incompatible options

2018-06-17 Thread Eric Sunshine
On Sun, Jun 17, 2018 at 1:59 AM Elijah Newren wrote: > git rebase has many options that only work with one of its three backends. > It also has a few other pairs of incompatible options. Document these. > > Signed-off-by: Elijah Newren > --- > diff --git a/Documentation/git-rebase.txt

[GIT PULL] l10n updates for 2.18.0 round 3

2018-06-17 Thread Jiang Xin
The following changes since commit 68372c88794aba15f853542008cda39def768372: Git 2.18-rc2 (2018-06-13 12:57:07 -0700) are available in the Git repository at: git://github.com/git-l10n/git-po tags/l10n-2.18.0-rnd3 for you to fetch changes up to fd8cb379022fc6f5c6d71d12d10c9388b9f5841c:

Re: [RFC PATCH v2 0/7] Document/fix/warn about rebase incompatibilities and inconsistences

2018-06-17 Thread Phillip Wood
Hi Elijah On 17/06/18 06:58, Elijah Newren wrote: git-rebase has lots of options that are mutually incompatible. Even among aspects of its behavior that is common to all rebase types, it has a number of inconsistencies. This series tries to document, fix, and/or warn users about many of

Re: [RFC PATCH v2 1/7] git-rebase.txt: document incompatible options

2018-06-17 Thread Phillip Wood
Hi Elijah On 17/06/18 06:58, Elijah Newren wrote: git rebase has many options that only work with one of its three backends. It also has a few other pairs of incompatible options. Document these. Signed-off-by: Elijah Newren --- Documentation/git-rebase.txt | 84

Re: [RFC PATCH v2 7/7] git-rebase: make --allow-empty-message the default

2018-06-17 Thread Phillip Wood
Hi Elijah On 17/06/18 06:58, Elijah Newren wrote: am-based rebases already apply commits with an empty commit message without requiring the user to specify an extra flag. Make merge-based and interactive-based rebases behave the same. Signed-off-by: Elijah Newren ---

Re: [PATCH v2] sequencer: do not squash 'reword' commits when we hit conflicts

2018-06-17 Thread Phillip Wood
Hi Elijah, On 17/06/18 06:37, Elijah Newren wrote: Ever since commit 18633e1a22 ("rebase -i: use the rebase--helper builtin", 2017-02-09), when a commit marked as 'reword' in an interactive rebase has conflicts and fails to apply, when the rebase is resumed that commit will be squashed into its

Re: [PATCH] submodule: fix NULL correctness in renamed broken submodules

2018-06-17 Thread Kaartic Sivaraam
On Thursday 14 June 2018 11:01 PM, Stefan Beller wrote: > While at it, make sure we only attempt to load the submodule if a git > directory of the submodule is found as default_name_or_path will return > NULL in case the git directory cannot be found. I found this a little hard to read. Maybe it

[PATCH v2] t3200: clarify description of --set-upstream test

2018-06-17 Thread Kaartic Sivaraam
Support for the --set-upstream option was removed in 52668846ea (builtin/branch: stop supporting the "--set-upstream" option, 2017-08-17). The change did not completely remove the command due to an issue noted in the commit's log message. So, a test was added to ensure that a command which uses

Re: OAuth2 support in git?

2018-06-17 Thread Johannes Schindelin
Hi Peff, On Thu, 14 Jun 2018, Jeff King wrote: > On Thu, Jun 14, 2018 at 10:13:42AM +, brian m. carlson wrote: > > > > I know that other git server environments like github support that on > > > client side by allowing tokens to be used as usernames in a BASIC > > > authentication flow. We

Re: [ANNOUNCE] Git v2.18.0-rc2

2018-06-17 Thread Johannes Schindelin
Team, On Wed, 13 Jun 2018, Junio C Hamano wrote: > A release candidate Git v2.18.0-rc2 is now available for testing > at the usual places. It is comprised of 852 non-merge commits > since v2.17.0, contributed by 65 people, 20 of which are new faces. > > The tarballs are found at: > >

Re: [PATCH] t3200: clarify description of --set-upstream test

2018-06-17 Thread Kaartic Sivaraam
On Thursday 14 June 2018 11:13 PM, Junio C Hamano wrote: > It is technically correct to call --set-upstream "unsupported", but > the reason why we want to see it fail is not because it is > unsupported, but because we actively interfere with the usual > "unique prefix" logic parse-options API

Re: [PATCH 00/15] Kill the_index part 1, expose it

2018-06-17 Thread Duy Nguyen
On Sun, Jun 17, 2018 at 9:02 AM Elijah Newren wrote: > > On Fri, Jun 15, 2018 at 10:41 PM, Nguyễn Thái Ngọc Duy > wrote: > > This is the beginning of the end of the_index. The problem with > > the_index is it lets library code anywhere access it freely. This is > > not good because from high

Re: [PATCH 00/15] Kill the_index part 1, expose it

2018-06-17 Thread Elijah Newren
On Fri, Jun 15, 2018 at 10:41 PM, Nguyễn Thái Ngọc Duy wrote: > This is the beginning of the end of the_index. The problem with > the_index is it lets library code anywhere access it freely. This is > not good because from high level you may not realize that the_index is > being used while you