Re: What's cooking in git.git (May 2017, #01; Mon, 1)

2017-05-01 Thread Brandon Williams
On 05/01, Ævar Arnfjörð Bjarmason wrote: > On Mon, May 1, 2017 at 7:35 AM, Junio C Hamano wrote: > > * ab/clone-no-tags (2017-05-01) 3 commits > > (merged to 'next' on 2017-04-30 at 601649896a) > > + tests: rename a test having to do with shallow submodules > > + clone: add a --no-tags option

Re: Bug Report: .gitignore behavior is not matching in git clean and git status

2017-05-01 Thread Samuel Lijin
After some more digging (and familiarizing myself with the behind-the-scenes logic) the issue is that dir.c has this implicit assumption that a directory which contains only untracked and ignored files should itself be considered untracked. While that works fine for use cases where we're asking if

Re[2]: git loses a commit after reordering.

2017-05-01 Thread Nikita Orlov
>On Sun, 30 Apr 2017, 1:56 +03:00 from Kevin Daudt : >Not sure if this is the case here, but it at least confirms that rebase >--preserve-merges was not meant to reorder commits. > >See [this][1] thread for more background on this limitation. > >[0]: https://git-scm.com/docs/git-rebase#_bugs >[1]:

Re: What's cooking in git.git (May 2017, #01; Mon, 1)

2017-05-01 Thread Ævar Arnfjörð Bjarmason
On Mon, May 1, 2017 at 7:35 AM, Junio C Hamano wrote: > * ab/clone-no-tags (2017-05-01) 3 commits > (merged to 'next' on 2017-04-30 at 601649896a) > + tests: rename a test having to do with shallow submodules > + clone: add a --no-tags option to clone without tags > + tests: change "cd ... &&

Re: Bug Report: .gitignore behavior is not matching in git clean and git status

2017-05-01 Thread Samuel Lijin
On Sun, Apr 30, 2017 at 8:56 PM, Chris Johnson wrote: > Good assessment/understanding of the issue. git clean -n does not > report anything as being targeted for removal, and git clean -f > matches that behavior. I agree with it probably being related > specifically to the -d flag. > > As another

Re: [PATCH v2] send-email: new options to walkaround email server limits

2017-05-01 Thread Jan Viktorin
Hello, thank you for posting this improvement. I've been missing such feature in git. I hope to test it soon. Jan Viktorin RehiveTech Sent from a mobile device   Původní zpráva   Od: xiaoqiang zhao Odesláno: pondělí, 1. května 2017 15:00 Komu: git@vger.kernel.org Kopie: gits...@pobox.com; vikto..

Re: Bug: wrong documentation for git-fast-import's option command

2017-05-01 Thread Tomi Belan
On Sun, Apr 30, 2017 at 12:21 PM, Andreas Schwab wrote: > Unless starts with 'git', as you have seen. Other importers > may recognize other options, eg 'option hg ...'. Hmm? Are you disagreeing with how I described the issue, or saying there is no issue at all? I'm not sure. I know the syntax

[PATCH v2] send-email: new options to walkaround email server limits

2017-05-01 Thread xiaoqiang zhao
Some email server(e.g. smtp.163.com) limits a fixed number emails to be send per session(connection) and this will lead to a send faliure. With --batch-size= option, an auto reconnection will occur when number of sent email reaches and the problem is solved. --relogin-delay option will make some

Re: [PATCH v2] l10n: de.po: update German translation

2017-05-01 Thread Simon Ruderich
On Sun, Apr 30, 2017 at 09:11:49PM +0200, Ralf Thielow wrote: > #: config.c:1952 > #, c-format > msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" > -msgstr "" > +msgstr "Unbekannter Wert '%s' in core.untrackedCache; benutze Stardardwert > 'keep'"

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

2017-05-01 Thread Johannes Schindelin
Hi Phillip, On Mon, 1 May 2017, Phillip Wood wrote: > On 28/04/17 20:22, Johannes Schindelin wrote: > > > BTW in the future you could help me a *lot* by providing a patch that > > adds a test case to our test suite that not only demonstrates what > > exactly goes wrong, but also will help preven

Re: [PATCH] cache-tree: reject entries with null sha1

2017-05-01 Thread René Scharfe
Am 01.05.2017 um 13:23 schrieb René Scharfe: But I can't get Valgrind to report overlapping (nicely explained in http://valgrind.org/docs/manual/mc-manual.html#mc-manual.overlap, by the way), not for t7009 and not for the short test program at the bottom. Do you set flags in GIT_VALGRIND_OPTIONS

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

2017-05-01 Thread Johannes Schindelin
Hi Junio, On Sun, 30 Apr 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > In that case, I would strongly advise to consider redesigning the API. > > The API we currently have and is used by "log", "rev-list" and friends > is to have setup_revisions() parse the av[], i.e. the tex

Re: [PATCH v1] travis-ci: retry if Git for Windows CI returns HTTP error 502 or 503

2017-05-01 Thread Lars Schneider
> On 29 Apr 2017, at 20:48, Lars Schneider wrote: > > The Git for Windows CI web app sometimes returns HTTP errors of > "502 bad gateway" or "503 service unavailable" [1]. Wait a little and > retry the request if this happens. > > [1] > https://docs.microsoft.com/en-in/azure/app-service-web/ap

Re: [PATCH] cache-tree: reject entries with null sha1

2017-05-01 Thread René Scharfe
Am 24.04.2017 um 12:39 schrieb Duy Nguyen: BTW, I ran t7009 with valgrind and it reported this. Is it something we should be worried about? I vaguely recall you're doing something with prio-queue... ==4246== Source and destination overlap in memcpy(0x5952990, 0x5952990, 16) ==4246==at 0x4C2E

Re: Automating Coverity, was Re: [PATCH 00/26] Address a couple of issues identified by Coverity

2017-05-01 Thread Lars Schneider
> On 28 Apr 2017, at 22:29, Johannes Schindelin > wrote: > > Hi Stefan, > > On Fri, 28 Apr 2017, Stefan Beller wrote: > >> On Thu, Apr 27, 2017 at 3:50 PM, Johannes Schindelin >> wrote: >> >>> I still have to find the time to figure out one more detail: how to >>> download and extract the C

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

2017-05-01 Thread Johannes Schindelin
Hi Junio, On Sun, 30 Apr 2017, Junio C Hamano wrote: > Phillip Wood writes: > > > This changes the behaviour of > > git -c rebase.instructionFormat= rebase -i > > The shell version treats the rebase.instructionFormat being unset or set > > to the empty string as equivalent. This version generat

Re: [PATCH] t7400: add BSLASHPSPEC prerequisite to 'add with \\ in path'

2017-05-01 Thread Johannes Schindelin
Hi Ramsay, On Sun, 30 Apr 2017, Ramsay Jones wrote: > On 29/04/17 11:44, Johannes Schindelin wrote: > > > On Sat, 29 Apr 2017, Johannes Sixt wrote: > >> Am 29.04.2017 um 02:15 schrieb Ramsay Jones: > >>> On 28/04/17 20:54, Johannes Sixt wrote: > Am 28.04.2017 um 05:09 schrieb Junio C Haman

Re: [PATCH 0/2] Make diff plumbing commands respect the indentHeuristic.

2017-05-01 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 29, 2017 at 12:04 AM, Jeff King wrote: > On Fri, Apr 28, 2017 at 10:34:15AM -0700, Stefan Beller wrote: > >> > So instead I chose to make the indentHeuristic option part of diff's basic >> > configuration, and in each of the diff plumbing commands I moved the call >> > to >> > git_con

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

2017-05-01 Thread Phillip Wood
On 28/04/17 20:22, Johannes Schindelin wrote: > Hi Philip, > > On Fri, 28 Apr 2017, Phillip Wood wrote: > >> On 26/04/17 12:59, Johannes Schindelin wrote: >> >>> The first step of an interactive rebase is to generate the so-called >>> "todo script", to be stored in the state directory as >>> "git

Re: [PATCH] i18n: remove i18n from tag reflog message

2017-05-01 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 29, 2017 at 12:02 PM, Jean-Noel Avila wrote: > The building of the reflog message is using strbuf, which is not > friendly with internationalization frameworks. No other reflog > messages are translated right now and switching all the messages to > i18n would require a major rework of

Re: [PATCH v3 0/5] archive-zip: support files and archives bigger than 4GB

2017-05-01 Thread René Scharfe
Am 01.05.2017 um 01:49 schrieb Junio C Hamano: René Scharfe writes: Am 30.04.2017 um 18:32 schrieb Johannes Sixt: Am 30.04.2017 um 09:53 schrieb René Scharfe: @@ -178,7 +182,8 @@ test_expect_success EXPENSIVE,UNZIP 'zip archive bigger than 4GB' ' "$GIT_UNZIP" -t many-big.zip ' -test

<    1   2