Re: [PATCH v3 2/6] path.c: new (identical) list for worktree v1

2016-01-27 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > +static struct common_dir common_list_v1[] = { > + ... > +}; > + > +static struct common_dir *get_common_list(void) > +{ > + switch (repository_format_worktree_version) { > + case 0: return common_list_v0; > + case 1: return

Starting on a microproject for GSoC

2016-01-27 Thread Moritz Neeb
Hi git developers, the next Google Summer of Code is not too far away. I expect git to apply for it and hopefully have some student spots which in turn I plan to apply. It was recommended elsewhere and on this list as well, that it is beneficial to engage with the community early, that's why I am

Re: Need support with git credential storage

2016-01-27 Thread Jeff King
On Wed, Jan 27, 2016 at 09:49:38PM +, Charles Bélanger wrote: > Here's the git clone command launch by a .sh script file called from > ~/.profile: > git clone https://myusern...@bitbucket.org/CompanyName/ProjectName.git > ~/Projects/SubFolderName/ProjectName > > Here's the error from bash

Re: git archive should use vendor extension in pax header

2016-01-27 Thread fuz
Hallo René, On Wed, Jan 27, 2016 at 09:31:15PM +0100, René Scharfe wrote: > Hello Robert, > > it's customary to discuss in the open by copying the list. Unless > there are secrets involved, but I don't see any below. I kept it > private anyway in case I missed any, but please cc: >

Re: [PATCH v3 1/6] worktree: new repo extension to manage worktree behaviors

2016-01-27 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Multiple worktree setup is still evolving and its behavior may be > changed in future. But we do not want to break existing worktree s/be changed/change/ > setups. A new set of extensions, worktree=X, is recognized to tell Git > what multiple

Re: [PATCH v3 0/6] Split .git/config in multiple worktree setup

2016-01-27 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > For any worktree, the new file .git/common/config is read first, then > either .git/config or .git/worktrees/xxx/config is read after. There's > no special per-worktree var list any more. Which is great. You want to > add per-worktree config

[PATCH v2 1/3] git: remove an early return from save_env_before_alias()

2016-01-27 Thread Junio C Hamano
Junio C Hamano writes: > Duy Nguyen writes: > >> On Wed, Jan 27, 2016 at 1:49 PM, Junio C Hamano wrote: >>> Junio C Hamano writes: >>> I spoke too soon, I am afraid. ... I wonder if this would be better

Re: GPL v2 authoritative answer on stored code as a derived work

2016-01-27 Thread Philip Oakley
From: "Junio C Hamano" Jonathan Smith writes: It's pretty clear that code stored in a Git repository isn't considered a derived work of Git, regardless of whether it is used in a commercial context or otherwise. I'm guessing here, but I

Re: [PATCH v3 4/6] worktree: new config file hierarchy

2016-01-27 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > ($C stands for $GIT_COMMON_DIR for the rest of the message) > > In main worktree, we read these config files in this order: > > 1) system config > 2) XDG config > 3) user config > 4) $GIT_DIR/config > > Currently linked worktrees share the same

[PATCH v2 3/3] git: simplify environment save/restore logic

2016-01-27 Thread Junio C Hamano
The only code that cares about the value of the global variable saved_env_before_alias after the previous fix is handle_builtin() that turns into a glorified no-op when the variable is true, so the logic could safely be lifted to its caller, i.e. the caller can refrain from calling it when the

Re: [PATCH v2 3/3] git: simplify environment save/restore logic

2016-01-27 Thread Junio C Hamano
Junio C Hamano writes: > @@ -598,9 +597,9 @@ static int run_argv(int *argcp, const char ***argv) >*/ > if (done_alias) > break; > + done_alias = 1; > if (!handle_alias(argcp, argv)) >

Re: Starting on a microproject for GSoC

2016-01-27 Thread Stefan Beller
On Wed, Jan 27, 2016 at 4:40 PM, Moritz Neeb wrote: > Hi git developers, > > the next Google Summer of Code is not too far away. I expect git to > apply for it and hopefully have some student spots which in turn I plan > to apply. It was recommended elsewhere and on this list

Re: eol round trip Was: [PATCH] travis-ci: run previously failed ....

2016-01-27 Thread Torsten Bögershausen
On 01/27/2016 08:05 PM, Junio C Hamano wrote: (Changed the topic, 2 notes inside) Clemens Buchacher writes: Coming back to "[PATCH] optionally disable gitattributes": The topics are related, because they both deal with the situation where the work tree has files which are not

Re: [PATCH] contrib/subtree: Split history with empty trees correctly

2016-01-27 Thread Marcus Brinkmann
On 01/28/2016 03:56 AM, David A. Greene wrote: Marcus Brinkmann writes: With my patch, "git subtree split -P" produces the same result (for my data set) as "git filter-branch --subdirectory-filter", which is much faster, because it selects the revisions to rewrite

Re: [PATCH] contrib/subtree: Split history with empty trees correctly

2016-01-27 Thread David A. Greene
[ Sorry it took a few days to reply. I am absolutely slammed at work and will be for the next few weeks at least. The good news is that it's resulting in some nice work on git-subtree! :) ] Marcus Brinkmann writes: > On 01/20/2016 05:05 AM, David A. Greene

Re: [PATCH] contrib/subtree: Split history with empty trees correctly

2016-01-27 Thread David A. Greene
Marcus Brinkmann writes: > With my patch, "git subtree split -P" produces the same result (for my > data set) as "git filter-branch --subdirectory-filter", which is much > faster, because it selects the revisions to rewrite before rewriting. > As I am not using any of

NEW ARRIVALS, CISCO,CPU's,Memory, LAPTOP AND AVAYA

2016-01-27 Thread Laison Computech Inc
Dear Sir/Madam, Clean tested working pulls CPUs and QTYs in stock. 115 X X5650 65 X E5410 75 X X5660 145 X E5530 100 X E5645 40 X X5680 75 X X5690 Brand new sealed IP phones and QTYs in stock. 55 x CP-7937G 77 x CP-7942G 54 x CP-7945G 75 x CP-7962G .. 45 x Avaya 9630

[PATCHv4 1/2] submodule: port resolve_relative_url from shell to C

2016-01-27 Thread Stefan Beller
Later on we want to automatically call `git submodule init` from other commands, such that the users don't have to initialize the submodule themselves. As these other commands are written in C already, we'd need the init functionality in C, too. The `resolve_relative_url` function is a large

[PATCHv4 2/2] submodule: port init from shell to C

2016-01-27 Thread Stefan Beller
By having the `init` functionality in C, we can reference it easier from other parts in the code. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- builtin/submodule--helper.c | 119 ++--

Re: Starting on a microproject for GSoC

2016-01-27 Thread Andrew Ardill
On 28 January 2016 at 11:40, Moritz Neeb wrote: > I suppose just fixing/revising this would be kind > of a too low hanging fruit? I am in no way qualified to speak to the majority of your post, but I can't imagine anyone refusing your work because it was 'too low hanging

Re: git archive should use vendor extension in pax header

2016-01-27 Thread fuz
On Tue, Jan 26, 2016 at 11:06:25PM +0100, René Scharfe wrote: > Am 24.01.2016 um 16:59 schrieb f...@fuz.su: > >Right now, git archive creates a pax global header of the form > > > > comment=57ca140635bf157354124e4e4b3c8e1bde2832f1 > > > >in tar archives it creates. This is suboptimal as as

[PATCH v2 2/3] git: protect against unbalanced calls to {save,restore}_env()

2016-01-27 Thread Junio C Hamano
We made sure that save_env_before_alias() does not skip saving the environment when asked to (which led to use-after-free of orig_cwd in restore_env() in the buggy version) with the previous step. Protect against future breakage where somebody adds new callers of these functions in an unbalanced

Re: [RFC] tag-ref and tag object binding

2016-01-27 Thread Jeff King
On Wed, Jan 27, 2016 at 08:53:08AM +0100, Michael J Gruber wrote: > > Yeah, definitely. My thinking was that `verify-tag` could learn a series > > of optional consistency checks, enabled by command line options, and > > verifying programs (or humans) could turn them on to avoid having to > >

[PATCH v3 01/20] mingw: let's use gettext with MSYS2

2016-01-27 Thread Johannes Schindelin
This solves two problems: - we now have proper localisation even on Windows - we sidestep the infamous "BUG: your vsnprintf is broken (returned -1)" message when running "git init" (which otherwise prevents the entire test suite from running) because libintl.h overrides vsnprintf() with

[PATCH v3 04/20] mingw: factor out Windows specific environment setup

2016-01-27 Thread Johannes Schindelin
From: Karsten Blees We will add more environment-related code to that new function in the next patch. Signed-off-by: Karsten Blees Signed-off-by: Johannes Schindelin --- compat/mingw.c | 30 +- 1 file

[PATCH v3 13/20] mingw: fix t9700's assumption about directory separators

2016-01-27 Thread Johannes Schindelin
This test assumed that there is only one directory separator (the forward slash), not two equivalent directory separators. However, on Windows, the back slash and the forward slash *are* equivalent. Let's paper over this issue by converting the backward slashes to forward ones in the test that

[PATCH v3 07/20] mingw: let lstat() fail with errno == ENOTDIR when appropriate

2016-01-27 Thread Johannes Schindelin
POSIX semantics requires lstat() to fail with ENOTDIR when "[a] component of the path prefix names an existing file that is neither a directory nor a symbolic link to a directory". See http://pubs.opengroup.org/onlinepubs/9699919799/functions/lstat.html This behavior is expected by

[PATCH v3 11/20] tests: turn off git-daemon tests if FIFOs are not available

2016-01-27 Thread Johannes Schindelin
The Git daemon tests create a FIFO first thing and will hang if said FIFO is not available. This is a problem with Git for Windows, where `mkfifo` is an MSYS2 program that leverages MSYS2's POSIX emulation layer, but `git-daemon.exe` is a MINGW program that has not the first clue about that POSIX

[PATCH v3 08/20] mingw: fix t5601-clone.sh

2016-01-27 Thread Johannes Schindelin
Since baaf233 (connect: improve check for plink to reduce false positives, 2015-04-26), t5601 writes out a `plink.exe` for testing that is actually a shell script. So the assumption that the `.exe` extension implies that the file is *not* a shell script is now wrong. Since there was no love for

[PATCH v3 14/20] mingw: work around pwd issues in the tests

2016-01-27 Thread Johannes Schindelin
In Git for Windows' SDK, the tests are run using a Bash that relies on the POSIX emulation layer MSYS2 (itself a friendly fork of Cygwin). As such, paths in tests can be POSIX paths. As soon as those paths are passed to git.exe (which does *not* use the POSIX emulation layer), those paths are

[PATCH v3 10/20] mingw: disable mkfifo-based tests

2016-01-27 Thread Johannes Schindelin
MSYS2 (the POSIX emulation layer used by Git for Windows' Bash) actually has a working mkfifo. The only problem is that it is only emulating named pipes through the MSYS2 runtime; The Win32 API has no idea about named pipes, hence the Git executable cannot access those pipes either. The symptom

[PATCH v3 06/20] mingw: try to delete target directory before renaming

2016-01-27 Thread Johannes Schindelin
From: =?UTF-8?q?=EB=A7=88=EB=88=84=EC=97=98?= When the rename() function tries to move a directory it fails if the target directory exists. It should check if it can delete the (possibly empty) target directory and then try again to move the directory. This partially

[PATCH v3 15/20] Avoid absolute path in t0008

2016-01-27 Thread Johannes Schindelin
From: Pat Thoyts The colon is used by check-ignore to separate paths from other output values. If we use an absolute path, however, on Windows it will be converted into a Windows path that very much contains a colon. It is actually not at all necessary to make

[PATCH v3 12/20] mingw: skip test in t1508 that fails due to path conversion

2016-01-27 Thread Johannes Schindelin
In Git for Windows, the MSYS2 POSIX emulation layer used by the Bash converts command-line arguments that looks like they refer to a POSIX path containing a file list (i.e. @) into a Windows path equivalent when calling non-MSYS2 executables, such as git.exe. Let's just skip the test that uses

[PATCH v3 03/20] Git.pm: stop assuming that absolute paths start with a slash

2016-01-27 Thread Johannes Schindelin
On Windows, absolute paths never start with a slash, unless a POSIX emulation layer is used. The latter is the case for MSYS2's Perl that Git for Windows leverages. However, in the tests we also go through plain `git.exe`, which does *not* leverage the POSIX emulation layer, and therefore the

[PATCH v3 18/20] mingw: handle the missing POSIXPERM prereq in t9124

2016-01-27 Thread Johannes Schindelin
On Windows, the permission system works completely differently than expected by some of the tests. So let's make sure that we do not test POSIX functionality on Windows. This lets t9124-git-svn-dcommit-auto-props.sh pass in Git for Windows' SDK. Signed-off-by: Johannes Schindelin

[PATCH v3 17/20] mingw: avoid illegal filename in t9118

2016-01-27 Thread Johannes Schindelin
On Windows' file systems, file names with trailing dots are forbidden. The POSIX emulation layer used by Git for Windows' Subversion emulates those file names, therefore the test adding the file would actually succeed, but when we would ask git.exe (which does not leverage the POSIX emulation

[PATCH v3 19/20] mingw: skip a test in t9130 that cannot pass on Windows

2016-01-27 Thread Johannes Schindelin
On Windows, Git itself has no clue about POSIX paths, but its shell scripts do. In this instance, we get mixed paths as a result, and when comparing the path of the author file, we get a mismatch that is entirely due to the POSIX path vs Windows path clash. Let's just skip this test so that

[PATCH v3 00/20] Let Git's tests pass on Windows

2016-01-27 Thread Johannes Schindelin
This is a big milestone. With these modifications, Git's source code does not only build without warnings in Git for Windows' SDK, but passes the entire regression test suite. The patch series contains three different types of patches. First, there are a couple of real fixes that were triggered

[PATCH v3 05/20] mingw: prepare the TMPDIR environment variable for shell scripts

2016-01-27 Thread Johannes Schindelin
When shell scripts access a $TMPDIR variable containing backslashes, they will be mistaken for escape characters. Let's not let that happen by converting them to forward slashes. This partially fixes t7800 with MSYS2. Signed-off-by: Johannes Schindelin ---

[PATCH v3 02/20] mingw: do not trust MSYS2's MinGW gettext.sh

2016-01-27 Thread Johannes Schindelin
It does not quite work because it produces DOS line endings which the shell does not like at all. This lets t0200-gettext-basic.sh, t0204-gettext-reencode-sanity.sh, t3406-rebase-message.sh, t3903-stash.sh, t7400-submodule-basic.sh, t7401-submodule-summary.sh, t7406-submodule-update.sh and

[PATCH v3 20/20] mingw: do not bother to test funny file names

2016-01-27 Thread Johannes Schindelin
MSYS2 actually allows to create files or directories whose names contain tabs, newlines or colors, even if plain Win32 API cannot access them. As we are using an MSYS2 bash to run the tests, such files or directories are created successfully, but Git itself has no chance to work with them because

[PATCH v3 16/20] mingw: mark t9100's test cases with appropriate prereqs

2016-01-27 Thread Johannes Schindelin
Many a test requires either POSIXPERM (to change the executable bit) or SYMLINKS, and neither are available on Windows. This lets t9100-git-svn-basic.sh pass in Git for Windows' SDK. Signed-off-by: Johannes Schindelin --- t/t9100-git-svn-basic.sh | 18

[PATCH v3 09/20] mingw: accomodate t0060-path-utils for MSYS2

2016-01-27 Thread Johannes Schindelin
On Windows, there are no POSIX paths, only Windows ones (an absolute Windows path looks like "C:\Program Files\Git\ReleaseNotes.html", under most circumstances, forward slashes are also allowed and synonymous to backslashes). So when a POSIX shell (such as MSYS2's Bash, which is used by Git for

Re: git for windows

2016-01-27 Thread Johannes Schindelin
Hi Andrey, we never saw the two mails you were replying to, and please note that 1) the preferred place to report bugs in Git for Windows is https://github.com/git-for-windows/git/issues, as outlined in https://git-for-windows.github.io/#contribute, and that 2) top-posting will most likely result

Re: [PATCH v2 16/19] mingw: mark t9100's test cases with appropriate prereqs

2016-01-27 Thread Johannes Schindelin
Hi Junio, On Tue, 26 Jan 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > @@ -181,7 +180,8 @@ test_expect_success "$name" ' > > name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL" > > LC_ALL="$GIT_SVN_LC_ALL" > > export LC_ALL > >

Re: [PATCH] optionally disable gitattributes

2016-01-27 Thread Clemens Buchacher
On Wed, Jan 27, 2016 at 04:04:39PM +0100, Torsten Bögershausen wrote: > > It feels like a workaround for something that could be fixable, or is already > ongoing. > Before going into more details, > could you tell us which attributes you are typically using (when having this > problems) ? > Is

Re: [PATCH v3 16/20] mingw: mark t9100's test cases with appropriate prereqs

2016-01-27 Thread Johannes Schindelin
Hi Junio, On Wed, 27 Jan 2016, Johannes Schindelin wrote: > --8323329-1704809497-1453911609=:2964 > Content-Type: text/plain; charset=X-UNKNOWN Oh well. I guess I am really too stupid to get this right... Will change my script to call format-patch with the --add-header='Content-Type:

[PATCH v5 0/2] Let merge-file write out conflict markers with correct EOLs

2016-01-27 Thread Johannes Schindelin
The original patch was sent by Beat Bolli in http://thread.gmane.org/gmane.comp.version-control.git/281600 My suggestion to extend it to respect gitattributes led to changes that broke the original patch. And they were misguided to begin with (see below). Since there have been a couple of

[PATCH v5 1/2] merge-file: let conflict markers match end-of-line style of the context

2016-01-27 Thread Johannes Schindelin
When merging files with CR/LF line endings, the conflict markers should match those, lest the output file has mixed line endings. This is particularly of interest on Windows, where some editors get *really* confused by mixed line endings. The original version of this patch by Beat Bolli

[PATCH v5 2/2] merge-file: ensure that conflict sections match eol style

2016-01-27 Thread Johannes Schindelin
In the previous patch, we made sure that the conflict markers themselves match the end-of-line style of the input files. However, this still left out the conflicting text itself: if it lacks a trailing newline, we add one, and should add a carriage return when appropriate, too. Signed-off-by:

Re: [PATCH v4 1/2] merge-file: let conflict markers match end-of-line style of the context

2016-01-27 Thread Johannes Schindelin
Hi Junio, On Wed, 27 Jan 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > [administrivia: I finally managed to correct e-mail address of peff@, > which has been giving me bounces for all the previous messages in > the thread] Oops! I got those bounces

Re: [PATCH v2 12/19] mingw: skip test in t1508 that fails due to path conversion

2016-01-27 Thread Johannes Schindelin
Hi Junio, On Wed, 27 Jan 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Tue, 26 Jan 2016, Junio C Hamano wrote: > > > >> Johannes Schindelin writes: > >> > >> > -git checkout -b @/at-test && > >> > +

Re: [PATCH] travis-ci: run previously failed tests first, then slowest to fastest

2016-01-27 Thread Clemens Buchacher
On Wed, Jan 27, 2016 at 12:49:31PM -0800, Junio C Hamano wrote: > Junio C Hamano writes: > > > I wonder what would break if we ask this question instead: > > > > We do not know if the working tree file and the indexed data > > match. Let's see if "git checkout" of

Re: [RFC] tag-ref and tag object binding

2016-01-27 Thread Junio C Hamano
Michael J Gruber writes: > Jeff King venit, vidit, dixit 27.01.2016 09:09: > >> The bigger issue is that gpg seems to give us only _one_ uid, when there >> may be several. E.g., Junio's v2.7.0 is signed by 96AFE6CB, which is a >> sub-key that has several uids

Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)

2016-01-27 Thread Stefan Beller
On Wed, Jan 27, 2016 at 12:46 AM, Lars Schneider wrote: > > On 26 Jan 2016, at 23:58, Junio C Hamano wrote: > >> Lars Schneider writes: >> >>> Hi Junio, >>> >>> Did you miss the topic "submodule: extend die message on failed

Re: [PATCH v4 1/2] merge-file: let conflict markers match end-of-line style of the context

2016-01-27 Thread Junio C Hamano
Johannes Schindelin writes: >> Just in case it was unclear, none of the comment above means I want >> any part of the patch redone--I am happy with this patch as-is. > > Thanks for saying that... I was about to try to make things clearer, but I > could not think of a

Re: [PATCH v4 1/2] merge-file: let conflict markers match end-of-line style of the context

2016-01-27 Thread Johannes Schindelin
Hi Junio, On Wed, 27 Jan 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> Just in case it was unclear, none of the comment above means I want > >> any part of the patch redone--I am happy with this patch as-is. > > > > Thanks for saying that... I was

Re: [PATCH] travis-ci: run previously failed tests first, then slowest to fastest

2016-01-27 Thread Junio C Hamano
Clemens Buchacher writes: > Coming back to "[PATCH] optionally disable gitattributes": The topics > are related, because they both deal with the situation where the work > tree has files which are not normalized according to gitattributes. But > my patch is more about saying: ok,

Re: [PATCH v2 12/19] mingw: skip test in t1508 that fails due to path conversion

2016-01-27 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Tue, 26 Jan 2016, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> > @@ -35,7 +35,10 @@ test_expect_success 'setup' ' >> >git checkout -b upstream-branch && >> >

Re: [PATCH v5 0/2] Let merge-file write out conflict markers with correct EOLs

2016-01-27 Thread Junio C Hamano
Thanks, will queue after looking at the interdiff since v4. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v4 1/2] merge-file: let conflict markers match end-of-line style of the context

2016-01-27 Thread Junio C Hamano
Johannes Schindelin writes: [administrivia: I finally managed to correct e-mail address of peff@, which has been giving me bounces for all the previous messages in the thread] > Your response is also an indicator to me that future myself will find the > same code

Re: [RFC] tag-ref and tag object binding

2016-01-27 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 27.01.2016 19:10: > Michael J Gruber writes: > >> Jeff King venit, vidit, dixit 27.01.2016 09:09: >> >>> The bigger issue is that gpg seems to give us only _one_ uid, when there >>> may be several. E.g., Junio's v2.7.0 is signed by

Re: [RFC] tag-ref and tag object binding

2016-01-27 Thread Jeff King
On Wed, Jan 27, 2016 at 09:09:31PM +0100, Michael J Gruber wrote: > "subkey" and "uid" are different things. You bind a subkey to your > primary key with that self-signature. subkeys don't carry any other > signatures. > > A primary key "carries" the uids, and whenever someone "signs your key" >

Re: [PATCH] git-svn: shorten glob error message

2016-01-27 Thread Junio C Hamano
Eric Wong writes: > Junio C Hamano wrote: >> I am not sure if it is a good idea to show */*/* as an example in >> the message (that is an anti-example of 'one set of wildcard' by >> having three stars, isn't it?), but that is not a new issue this >>

Re: [PATCH v2 00/19] Let Git's tests pass on Windows

2016-01-27 Thread Junio C Hamano
Johannes Schindelin writes: > I made a couple of other adjustments anyway, so expect a new iteration > shortly. This time cross-checked on Linux. Thanks, will take a look. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [PATCH] travis-ci: run previously failed tests first, then slowest to fastest

2016-01-27 Thread Junio C Hamano
Junio C Hamano writes: > One way to solve (1) I can think of is to change the definition of > ce_compare_data(), which is called by the code that does not trust > the cached stat data (including but not limited to the Racy Git > codepath). The current semantics of that

Need support with git credential storage

2016-01-27 Thread Charles Bélanger
Hello Git Community, I'm working at AddEnergie at Quebec city in Canada and I'm currently working on making a Build Server in a Virtual Machine running Ubuntu. We are using git for our source code and I'm the first one here that need to use git store credentials for an Automated Build Server

[PATCHv4 0/2] Port `git submodule init` from shell to C

2016-01-27 Thread Stefan Beller
Hi, I looked at this patch series again and fixed all memory leaks as found by coverity scan. This applies on top of sb/submodule-parallel-update Thanks, Stefan Interdiff to v3: diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index c9b0c05..dd8b2a5 100644 ---

Re: [PATCH] git.c: fix help.autocorrect after 57ea712 breaks it

2016-01-27 Thread Junio C Hamano
Duy Nguyen writes: > On Wed, Jan 27, 2016 at 1:49 PM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> I spoke too soon, I am afraid. >>> ... >>> I wonder if this would be better done as a multi-part series that >>> goes like this:

Re: [PATCH] optionally disable gitattributes

2016-01-27 Thread Junio C Hamano
Clemens Buchacher writes: > If committed files are not normalized, adding gitattributes has the > side effect that such files are shown as modified, even though they > were not actually modified by the user, and the work tree matches > the committed file. This is because with

Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)

2016-01-27 Thread Lars Schneider
On 26 Jan 2016, at 23:58, Junio C Hamano wrote: > Lars Schneider writes: > >> Hi Junio, >> >> Did you miss the topic "submodule: extend die message on failed >> checkout with depth argument" or do you not agree with it >> ($gmane/282779)? Stefan

Re: git for windows

2016-01-27 Thread Andrey Chernyshov
On 1/27/2016 2:35 PM, Andrey Chernyshov wrote: On 1/27/2016 2:32 PM, Andrey Chernyshov wrote: Hi I'm using PHP storm with git for windows. Once I do a push to the github I get the following error Problem signature: Problem Event Name:APPCRASH Application Name:

Re: [PATCH v2 19/19] mingw: do not bother to test funny file names

2016-01-27 Thread Johannes Schindelin
Hi Eric, On Tue, 26 Jan 2016, Eric Sunshine wrote: > On Tue, Jan 26, 2016 at 9:35 AM, Johannes Schindelin > wrote: > > MSYS2 actually allows to create files or directories whose names contain > > tabs, newlines or colors, even if plain Win32 API cannot access them. >

Re: [PATCH v2] t0027: Add tests for get_stream_filter()

2016-01-27 Thread Torsten Bögershausen
- This needs to go on top of tb/ls-files-eol With missing "separate commit", I am having a hard time to decide if this is something I should pick up at this moment, or I should wait until that separate commit materializes. What is your intention? I send a serious including this patch the

Re: [PATCH] git.c: fix help.autocorrect after 57ea712 breaks it

2016-01-27 Thread Duy Nguyen
On Wed, Jan 27, 2016 at 1:49 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> I spoke too soon, I am afraid. >> ... >> I wonder if this would be better done as a multi-part series that >> goes like this: >> ... > > So here is the first of the

Re: [PATCH] convert: legitimately disable clean/smudge filter with an empty override

2016-01-27 Thread Lars Schneider
On 24 Jan 2016, at 22:45, Jeff King wrote: > On Sun, Jan 24, 2016 at 01:22:50PM +0100, larsxschnei...@gmail.com wrote: > >> From: Lars Schneider >> >> A clean/smudge filter can be disabled if set to an empty string. However, >> Git will try to run the

Re: [PATCH] convert: legitimately disable clean/smudge filter with an empty override

2016-01-27 Thread Lars Schneider
On 24 Jan 2016, at 22:35, Eric Sunshine wrote: > On Sun, Jan 24, 2016 at 10:06 AM, Torsten Bögershausen wrote: >> On 24.01.16 13:22, larsxschnei...@gmail.com wrote: >>> From: Lars Schneider >>> diff --git a/convert.c

Re: [PATCH v2 12/19] mingw: skip test in t1508 that fails due to path conversion

2016-01-27 Thread Johannes Schindelin
Hi Junio, On Tue, 26 Jan 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > @@ -35,7 +35,10 @@ test_expect_success 'setup' ' > > git checkout -b upstream-branch && > > test_commit upstream-one && > > test_commit upstream-two && > > - git

Re: [RFC] tag-ref and tag object binding

2016-01-27 Thread Michael J Gruber
Jeff King venit, vidit, dixit 27.01.2016 09:09: > On Wed, Jan 27, 2016 at 08:53:08AM +0100, Michael J Gruber wrote: > >>> Yeah, definitely. My thinking was that `verify-tag` could learn a series >>> of optional consistency checks, enabled by command line options, and >>> verifying programs (or

Re: [PATCH] convert: legitimately disable clean/smudge filter with an empty override

2016-01-27 Thread Lars Schneider
On 24 Jan 2016, at 16:06, Torsten Bögershausen wrote: > On 24.01.16 13:22, larsxschnei...@gmail.com wrote: >> From: Lars Schneider > Some minor nits inside: >> >> A clean/smudge filter can be disabled if set to an empty string. > "set to an empty

[PATCH] optionally disable gitattributes

2016-01-27 Thread Clemens Buchacher
If committed files are not normalized, adding gitattributes has the side effect that such files are shown as modified, even though they were not actually modified by the user, and the work tree matches the committed file. This is because with gitattributes, the file is modified on the fly when git

Re: What's cooking in git.git (Jan 2016, #05; Tue, 26)

2016-01-27 Thread Johannes Schindelin
Hi Junio, On Tue, 26 Jan 2016, Junio C Hamano wrote: > * js/mingw-tests (2016-01-26) 20 commits > - mingw: skip a test in t9130 that cannot pass on Windows > - mingw: do not bother to test funny file names > - mingw: handle the missing POSIXPERM prereq in t9124 > - mingw: avoid illegal

Re: [PATCH v2 00/19] Let Git's tests pass on Windows

2016-01-27 Thread Johannes Schindelin
Hi Junio, On Tue, 26 Jan 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > This is a big milestone. With these modifications, Git's source code > > does not only build without warnings in Git for Windows' SDK, but > > passes the entire regression test

Re: [PATCH v2 18/19] mingw: handle the missing POSIXPERM prereq in t9124

2016-01-27 Thread Johannes Schindelin
Hi Junio, On Tue, 26 Jan 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Windows, the permission system works completely differently than > > expected by some of the tests. So let's make sure that we do not test > > POSIX functionality on Windows.

Dear Sir or Madam! - please help our site - пожалуйста, помогите нашему сайту - будь ласка, допоможіть нашому сайту http://petition.kiev.ua/

2016-01-27 Thread admin
Dear Sir or Madam! please at the top of any page of site click once on the advertising banner, so that we could pay for hosting our site, Thank you ad...@petition.kiev.ua http://petition.kiev.ua/ добрий день, просимо на будь-якій сторінці вгорі один раз натиснути на рекламний банер, щоб ми

Re: git for windows

2016-01-27 Thread Andrey Chernyshov
Additional note - when I use the command line git push doesn't display any errors but no updates on github... git status says : On branch master Your branch is ahead of 'origin/master' by 3 commits. On 1/27/2016 2:51 PM, Andrey Chernyshov wrote: On 1/27/2016 2:35 PM, Andrey Chernyshov

Re: [PATCH] optionally disable gitattributes

2016-01-27 Thread Torsten Bögershausen
On 27.01.16 12:59, Junio C Hamano wrote: > Clemens Buchacher writes: > >> If committed files are not normalized, adding gitattributes has the >> side effect that such files are shown as modified, even though they >> were not actually modified by the user, and the work tree matches

[ANNOUNCE] Git-backup - Backup set of Git repositories & just files; efficiently

2016-01-27 Thread Kirill Smelkov
https://lab.nexedi.com/kirr/git-backup.git This program backups files and set of bare Git repositories into one Git repository. Files are copied to blobs and then added to tree under certain place, and for Git repositories, all reachable objects are pulled in with maintaining index which

[PATCH v1 1/6] t0027: Add tests for get_stream_filter()

2016-01-27 Thread tboegi
From: Torsten Bögershausen When a filter is configured, a different code-path is used in convert.c and entry.c via get_stream_filter(), but there are no test cases yet. Add tests for the filter API by configuring the ident filter. The result of the SHA1 conversion is not checked,

Re: [PATCH] travis-ci: run previously failed tests first, then slowest to fastest

2016-01-27 Thread Clemens Buchacher
I think Junio pointed me to this thread from "[PATCH] optionally disable gitattributes". Since I am not sure I am following everything correctly in this thread, allow me to recapitulate what I understood so far. Firstly, I think the racy'ness of t0025 is understood. It is due to the