On 12/5/2016 06:15, David Aguilar wrote:
On Fri, Dec 02, 2016 at 05:05:06PM +0100, Johannes Schindelin wrote:
Hi Peter,
On Fri, 2 Dec 2016, P. Duijst wrote:
Incase filenames are used with a quote ' or a bracket [ (and maybe some more
characters), git "diff" and "difftool -y" works fine, but
On Sun, Dec 04, 2016 at 11:26:04PM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > Which I think would include both of the flags you mentioned, along with
> > others like SYMMETRIC_LEFT, PATCHSAME, etc. Probably really everything
> > mentioned in revision.h, which should be summed up as A
On Sun, Dec 04, 2016 at 11:19:46PM -0800, Junio C Hamano wrote:
> > - if (no_index)
> > + if (no_index) {
> > /* If this is a no-index diff, just run it and exit there. */
> > + startup_info->have_repository = 0;
> > diff_no_index(&rev, argc, argv);
> > + }
Jeff King writes:
> Which I think would include both of the flags you mentioned, along with
> others like SYMMETRIC_LEFT, PATCHSAME, etc. Probably really everything
> mentioned in revision.h, which should be summed up as ALL_REV_FLAGS.
> Some callsites already seem to feed that to clear_commit_ma
Jack Bates writes:
> The three cases where "git diff" operates outside of a repository are 1)
> when we run it outside of a repository, 2) when one of the files we're
> comparing is outside of the repository we're in, and 3) the --no-index
> option. Commit 4f03666 ("diff: handle sha1 abbreviation
On Sun, Dec 04, 2016 at 11:22:52AM -, Philip Oakley wrote:
> > Ever since 722ff7f876 (receive-pack: quarantine objects until
> > pre-receive accepts, 2016-10-03, v2.11.0), Git has been quarantining
> > objects and packs received during an incoming push into a separate
> > objects directory and
On Sun, Dec 04, 2016 at 01:37:00AM -0800, Kyle J. McKay wrote:
> On Dec 3, 2016, at 20:55, Jeff King wrote:
>
> > So I do think this is worth dealing with, but I'm also curious why
> > you're hitting the depth-5 limit. I'm guessing it has to do with hosting
> > a hierarchy of related repos. But i
On Mon, Dec 05, 2016 at 01:15:00AM -0500, Jeff King wrote:
> On Mon, Dec 05, 2016 at 01:01:16AM -0500, Jeff King wrote:
>
> > Note that setting abbrev to "0" outside of a repository was broken
> > recently by 4f03666ac (diff: handle sha1 abbreviations outside of
> > repository, 2016-10-20).
On Sun, Dec 04, 2016 at 12:47:47PM -0700, Jack Bates wrote:
> The three cases where "git diff" operates outside of a repository are 1)
> when we run it outside of a repository, 2) when one of the files we're
> comparing is outside of the repository we're in, and 3) the --no-index
> option. Commit
On Mon, Dec 05, 2016 at 01:01:16AM -0500, Jeff King wrote:
> Note that setting abbrev to "0" outside of a repository was broken
> recently by 4f03666ac (diff: handle sha1 abbreviations outside of
> repository, 2016-10-20). It adds a special out-of-repo code path for
> handling abbreviation
On Fri, Dec 02, 2016 at 11:48:40AM -0700, Jack Bates wrote:
> The "git diff --no-index" codepath didn't handle the --no-abbrev option.
> Also it didn't behave the same as find_unique_abbrev()
> in the case where abbrev == 0.
> find_unique_abbrev() returns the full, unabbreviated string in that
> c
On Mon, Dec 05, 2016 at 08:09:58AM +0900, Mike Hommey wrote:
> While trying to use the revision walking API twice in a row, I noticed
> that the second time for the same setup would not yield the same result.
> In my case, it turns out I was requesting boundaries, and
> reset_revision_walk() is no
On Sun, Dec 04, 2016 at 08:45:59PM +, Ramsay Jones wrote:
>
> Signed-off-by: Ramsay Jones
> ---
>
> Hi Junio,
>
> I recently noticed that:
>
> $ make >pout 2>&1
> $ ./git version
> git version 2.11.0.286.g109e8a9
> $ git describe
> v2.11.0-286-g109e8a99d
> $
>
> .
On Fri, Dec 02, 2016 at 05:05:06PM +0100, Johannes Schindelin wrote:
> Hi Peter,
>
> On Fri, 2 Dec 2016, P. Duijst wrote:
>
> > Incase filenames are used with a quote ' or a bracket [ (and maybe some
> > more
> > characters), git "diff" and "difftool -y" works fine, but git *difftool
> > **-d*
On Fri, Dec 02, 2016 at 05:21:53PM -0500, Jeff King wrote:
> On Fri, Dec 02, 2016 at 01:15:02PM -0500, ken edward wrote:
>
> > Where is Doc to configure Git + Apache + kerberos for Project level
> > access in repo?
>
> I don't know about Kerberos, but all of the documentation in git for
> configu
On Mon, Dec 05, 2016 at 08:09:58AM +0900, Mike Hommey wrote:
> Hi,
>
> While trying to use the revision walking API twice in a row, I noticed
> that the second time for the same setup would not yield the same result.
> In my case, it turns out I was requesting boundaries, and
> reset_revision_walk
Hi,
While trying to use the revision walking API twice in a row, I noticed
that the second time for the same setup would not yield the same result.
In my case, it turns out I was requesting boundaries, and
reset_revision_walk() is not resetting CHILD_SHOWN and BOUNDARY, both
required to be reset f
On Fri, Dec 02, 2016 at 03:04:01PM -0800, Frank Becker wrote:
> Hi,
>
> looks like this broke between 2.9.2 and 2.9.3
>
> cat ~/.gitconfig
> [difftool "diff"]
> cmd = ls -l ${LOCAL}/* ${REMOTE}/*
> #cmd = diff -r ${LOCAL} ${REMOTE} | less
>
> ~/stuff/gittest> ls -l *
> d1:
> total 8
> -r
"deepen by excluding" does not make sense because excluding a revision
does not deepen a repository; it makes the repository more shallow.
Signed-off-by: Alex Henrie
---
builtin/clone.c | 2 +-
builtin/fetch.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/clone.c
The article "the" is required here.
Signed-off-by: Alex Henrie
---
builtin/receive-pack.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index e6b3879..6b97cbd 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.
Multiple revisions cannot be a single ancestor.
Signed-off-by: Alex Henrie
---
bisect.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bisect.c b/bisect.c
index 21bc6da..8e63c40 100644
--- a/bisect.c
+++ b/bisect.c
@@ -747,7 +747,7 @@ static void handle_bad_merge_base(void)
Signed-off-by: Ramsay Jones
---
Hi Junio,
I recently noticed that:
$ make >pout 2>&1
$ ./git version
git version 2.11.0.286.g109e8a9
$ git describe
v2.11.0-286-g109e8a99d
$
... for non-release builds, the commit part of the version
string was still using an --abbrev=7.
On Sun, Dec 04, 2016 at 05:36:46PM +0100, Timon wrote:
> This is a regression in git 2.11.0 (version 2.10.2 is fine).
>
> In git-gui I select multiple files in the Unstaged Changes (using
> shift+click) and press ctrl+t to stage them. Then only one files gets
> staged instead of all of the selecte
The three cases where "git diff" operates outside of a repository are 1)
when we run it outside of a repository, 2) when one of the files we're
comparing is outside of the repository we're in, and 3) the --no-index
option. Commit 4f03666 ("diff: handle sha1 abbreviations outside of
repository", 201
Julian de Bhal writes:
> The behaviour that would make the most sense to me (personally) would be
> for a hard reset to unstage new files,...
I think _sometimes_ that may be useful. I haven't thought things
through yet to arrive the final decision, but one thing that must be
kept in mind by any
This is a regression in git 2.11.0 (version 2.10.2 is fine).
In git-gui I select multiple files in the Unstaged Changes (using
shift+click) and press ctrl+t to stage them. Then only one files gets
staged instead of all of the selected files.
The same happens when unstaging files.
Git-cola also ex
From: Lars Schneider
If git-p4 tried to store an empty file in GitLFS then it crashed while
parsing the pointer file:
oid = re.search(r'^oid \w+:(\w+)', pointerFile, re.MULTILINE).group(1)
AttributeError: 'NoneType' object has no attribute 'group'
This happens because GitLFS does not create
From: Peter Law
Teach git-completion.bash about the 'diff' option to 'git diff
--submodule=', which was added in Git 2.11.
Signed-off-by: Peter Law
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.b
From: Lars Schneider
P4 commands can fail due to random network issues. P4 users can counter
these issues by using a retry flag supported by all p4 commands [1].
Add an integer Git config value `git-p4.retries` to define the number of
retries for all p4 invocations. If the config is not defined
From: Lars Schneider
Update Travis-CI dependencies to the latest available versions in
Linux build.
Signed-off-by: Lars Schneider
---
Notes:
Base Commit: 454cb6b (v2.11.0)
Diff on Web: https://git.io/test_ls_travisci_dep-update-v1.diff
Checkout:git fetch https://github.com/lars
From: Lars Schneider
Remove superfluous .gitignore pattern and invalid '.' in `git commit`
calls.
Signed-off-by: Lars Schneider
---
Notes:
Base Commit: 454cb6b (v2.11.0)
Diff on Web: https://git.io/test_ls_filter-process_cleanup-test-v1.diff
Checkout:git fetch https://github.co
From: "Kyle J. McKay"
Sent: Sunday, December 04, 2016 12:24 AM
The recent addition of pre-receive quarantining breaks nested
alternates that are already at the maximum alternates nesting depth.
In the file sha1_file.c in the function link_alt_odb_entries we have
this:
> if (depth > 5) {
>
On Sun, Dec 4, 2016 at 1:57 AM, Julian de Bhal wrote:
> On Sat, Dec 3, 2016 at 6:11 PM, Christian Couder
> wrote:
>> On Sat, Dec 3, 2016 at 6:04 AM, Julian de Bhal
>> wrote:
>>> but I'd be nearly as happy if a
>>> commit was added to the reflog when the reset happens (I can probably make
>>> th
On Dec 3, 2016, at 20:55, Jeff King wrote:
So I do think this is worth dealing with, but I'm also curious why
you're hitting the depth-5 limit. I'm guessing it has to do with
hosting
a hierarchy of related repos. But is your system then always in danger
of busting the 5-limit if people create
On Fri, Dec 02, 2016 at 05:37:50PM -0500, Jeff King wrote:
> On Fri, Dec 02, 2016 at 06:02:16PM +, thomas.attw...@stfc.ac.uk wrote:
>
> > After updating git from 2.10.0 to 2.11.0 when trying to push any
> > changes to a repo located in a windows share, the following error
> > occurs:
> >
> >
35 matches
Mail list logo