On Thu, Oct 09, 2014 at 09:22:19PM +0200, Johannes Schindelin wrote:
Hi,
On Wed, 8 Oct 2014, Marat Radchenko wrote:
+CC_MACH := $(shell sh -c '$(CC) -dumpmachine 2/dev/null || echo not')
There is a rather huge problem with that. The latest mingw-w64 release,
4.9.1, does not do what you
On 10/13/2014 11:07 PM, Jeff King wrote:
On Mon, Oct 13, 2014 at 11:24:42AM -0700, Junio C Hamano wrote:
[...]
Is your plan to reroll the prune-mtime stuff on top of these? The
additional safety those patches would give us is valuable and they
are pretty straight-forward---I was hoping to
brian m. carlson wrote:
On Mon, Oct 13, 2014 at 01:41:31PM -0700, Junio C Hamano wrote:
brian m. carlson sand...@crustytoothpaste.net writes:
The second two patches implement some basic support for building with
Asciidoctor. The first of these moves some items into variables due to
some
It is possible that a user is trying to run a git command and fail to realize
that they are not in a git repository or working tree. When trying to complete
an operation, __git_refs would fall to a degenerate case and attempt to use
git for-each-ref, which would emit the error.
Let's fix this by
On Tue, Oct 14, 2014 at 12:07:51PM +0200, Jakub Narębski wrote:
brian m. carlson wrote:
On Mon, Oct 13, 2014 at 01:41:31PM -0700, Junio C Hamano wrote:
What I do not understand is that 3/4 lets you drop inclusion of
asciidoc.conf which contains a lot more than just linkgit:
definition.
On Tue, Oct 14, 2014 at 2:13 AM, Junio C Hamano gits...@pobox.com wrote:
On Mon, Oct 13, 2014 at 2:53 PM, Felipe Franciosi fel...@paradoxo.org wrote:
On Mon, Oct 13, 2014 at 9:12 PM, Junio C Hamano gits...@pobox.com wrote:
FNV/I/IDIV10/0 covers all the possibilities of (method 3), I would
On Sun, Oct 12, 2014 at 12:13 PM, Max Kirillov m...@max630.net wrote:
These are fixes of issues with submodules with use of multiple working
trees.
I think the patches look fine from the nd/multiple-work-trees writer's
perspective. I know too little about submodules to judge if this is
the
On Tue, Oct 14, 2014 at 10:52:30AM +0200, Michael Haggerty wrote:
Is your plan to reroll the prune-mtime stuff on top of these? The
additional safety those patches would give us is valuable and they
are pretty straight-forward---I was hoping to have them in the 2.2
release.
Yes,
On Mon, Oct 13, 2014 at 09:37:27AM +1100, Ben Aveling wrote:
A question about fsck - is there a reason it doesn't have an option to
delete bad objects?
If the objects are reachable, then deleting them would create other big
problems (i.e., we would be breaking the object graph!).
If they are
On Sat, Oct 11, 2014 at 11:37:32PM +, brian m. carlson wrote:
This series is designed to implement the changes necessary to build Git
using Asciidoctor instead of AsciiDoc.
Thanks. I had always taken the attitude that we wrote for the original
Python AsciiDoc, and that using AsciiDoctor
On Tue, Oct 14, 2014 at 6:49 AM, John Szakmeister j...@szakmeister.net wrote:
It is possible that a user is trying to run a git command and fail to realize
that they are not in a git repository or working tree. When trying to
complete
an operation, __git_refs would fall to a degenerate case
On Mon, Oct 13, 2014 at 12:08:09PM -0700, Junio C Hamano wrote:
I wonder if run-command should provide a managed env array similar
to the args array.
I took a look at a few of them:
I took a brief look, too.
I had hoped we could just all it env and everybody would be happy
using it
On Mon, Oct 13, 2014 at 9:54 PM, Junio C Hamano gits...@pobox.com wrote:
Etienne Buira etienne.bu...@gmail.com writes:
Threads count being defaulted to 0 (autodetect), and --disable-pthreads
build checking that thread count==1, there were spurious warnings about
threads being ignored, despite
On Mon, Oct 13, 2014 at 10:00 PM, Junio C Hamano gits...@pobox.com wrote:
Etienne Buira etienne.bu...@gmail.com writes:
Wrap atexit()s calls on unthreaded builds to handle callback list
internally.
This is needed because on unthreaded builds, asyncs inherits parent's
atexit() list, that
On Tue, Oct 14, 2014 at 4:44 AM, Felipe Franciosi fel...@paradoxo.org wrote:
On Tue, Oct 14, 2014 at 2:13 AM, Junio C Hamano gits...@pobox.com wrote:
If I really had to choose between the two, adding a useless initialization
would be the less harmful choice. Adding a meaningless default: robs
Jeff King p...@peff.net writes:
On Sat, Oct 11, 2014 at 11:37:32PM +, brian m. carlson wrote:
Specifically I'm not excited about getting into a state where we have to
maintain both an asciidoc.conf file _and_ ruby extensions for
asciidoctor. I don't mind if somebody wants to step up and
Am 14.10.2014 um 14:17 schrieb Duy Nguyen:
On Sun, Oct 12, 2014 at 12:13 PM, Max Kirillov m...@max630.net wrote:
These are fixes of issues with submodules with use of multiple working
trees.
I think the patches look fine from the nd/multiple-work-trees writer's
perspective. I know too little
Jens Lehmann jens.lehm...@web.de writes:
But I can't see how that can work by just sharing the modules directory
tree, as that contains work tree related files - e.g. the index - for
each submodule. AFAICS sharing them between work trees will work only
if the content of the modules directory
From: Jonathan Nieder jrnie...@gmail.com
Date: Tue, 7 Oct 2014 15:16:57 -0400
Many config-parsing helpers, like parse_branch_color_slot,
take the name of a config variable and an offset to the
slot name (e.g., color.branch.plain is passed along with
13 to effectively pass plain). This is leftover
Junio C Hamano wrote:
builtin/branch.c | 16
builtin/commit.c | 19 +--
builtin/log.c| 2 +-
log-tree.c | 4 ++--
log-tree.h | 2 +-
5 files changed, 21 insertions(+), 22 deletions(-)
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
--
John Szakmeister j...@szakmeister.net writes:
It is possible that a user is trying to run a git command and fail to realize
that they are not in a git repository or working tree. When trying to
complete
an operation, __git_refs would fall to a degenerate case and attempt to use
git
On Tue, Oct 14, 2014 at 10:26:42AM -0700, Junio C Hamano wrote:
And multiple-worktree _is_ about keeping the same repository and
history data (i.e. object database, refs, rerere database, reflogs for
refs/*) only once, while allowing multiple working trees attached to
that single copy.
So
Am 14.10.2014 um 04:32 schrieb Jess Austin:
diff --git a/contrib/completion/git-prompt.sh
b/contrib/completion/git-prompt.sh
index c5473dc..d7559ff 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -84,6 +84,11 @@
# GIT_PS1_SHOWCOLORHINTS to a
On 2014-10-14 14:47, Johannes Sixt wrote:
Am 14.10.2014 um 04:32 schrieb Jess Austin:
diff --git a/contrib/completion/git-prompt.sh
b/contrib/completion/git-prompt.sh
index c5473dc..d7559ff 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -84,6 +84,11
On Tue, Oct 14, 2014 at 2:29 PM, Junio C Hamano gits...@pobox.com wrote:
John Szakmeister j...@szakmeister.net writes:
It is possible that a user is trying to run a git command and fail to realize
that they are not in a git repository or working tree. When trying to
complete
an operation,
On 2014-10-13 22:32, Jess Austin wrote:
Set __git_ps1 to display nothing when present working directory is
ignored, triggered by either the new environmental variable
GIT_PS1_HIDE_ON_IGNORED_PWD or the new repository configuration
variable bash.hideOnIgnoredPwd (or both). In the absence of
Am 14.10.2014 um 20:34 schrieb Max Kirillov:
On Tue, Oct 14, 2014 at 10:26:42AM -0700, Junio C Hamano wrote:
And multiple-worktree _is_ about keeping the same repository and
history data (i.e. object database, refs, rerere database, reflogs for
refs/*) only once, while allowing multiple working
While use of the --reference option to borrow objects from an
existing local repository of the same project is an effective way to
reduce traffic when cloning a project over the network, it makes the
resulting borrowing repository dependent on the borrowed
repository. After running
git
On Tue, Oct 14, 2014 at 07:09:45PM +0200, Jens Lehmann wrote:
Until that problem is solved it looks wrong to pass
GIT_COMMON_DIR into submodule recursion, I believe
GIT_COMMON_DIR should be added to the local_repo_env array
(and even if it is passed on later, we might have to
append
John Szakmeister j...@szakmeister.net writes:
On Tue, Oct 14, 2014 at 2:29 PM, Junio C Hamano gits...@pobox.com wrote:
...
Hmph, do you mean this one?
$ cd /var/tmp ;# not a git repository
$ git checkout TAB
-
$ git checkout fatal: Not a git repository (or any of the parent
When checking out a branch that is set to build on top of another
branch (often, a remote-tracking branch), git checkout reports how
your work relates to the other branch, e.g.
Your branch is behind 'origin/master', and can be fast-forwarded.
Back when this feature was introduced, this was
On Tue, Oct 14, 2014 at 09:51:22PM +0200, Jens Lehmann wrote:
Am 14.10.2014 um 20:34 schrieb Max Kirillov:
But here are a lot of nuances. For example, it makes
sense to have a superproject checkout without submodules
being initialized (so that they don't waste space and
machine time for
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
You can find the changes described here in the integration branches
of the repositories listed at
Hi, this is David Wu from Shanghai, China.
We are a printing company, we can print color box, corrugated box,
label, hang tag etc.
Please let me know if you need these.
I will send you the website then.
Best regards,
David Wu
--
To unsubscribe from this list: send the line unsubscribe git in
the
This series by Ronnie was last seen on-list at [1]. It includes some
improvements to the ref-transaction API, improves handling of poorly
named refs (which should make it easier to tighten the refname format
checks in the future), and is a stepping stone toward later series
that use the
From: Jonathan Nieder jrnie...@gmail.com
Date: Wed, 10 Sep 2014 14:01:46 -0700
The tests for 'git mv moves a submodule' functionality often run
commands like
git mv sub mod/sub
to move a submodule into a subdirectory. Just like plain /bin/mv,
this is supposed to succeed if the mod/
From: Ronnie Sahlberg sahlb...@google.com
Date: Wed, 16 Jul 2014 11:01:18 -0700
Simplify the function warn_if_unremovable slightly. Additionally, change
behaviour slightly. If we failed to remove the object because the object
does not exist, we can still return success back to the caller since
From: Ronnie Sahlberg sahlb...@google.com
Date: Thu, 2 Oct 2014 07:59:02 -0700
lock_ref_sha1_basic is used to lock refs that sit directly in the .git
dir such as HEAD and MERGE_HEAD in addition to the more ordinary refs
under refs/. Remove the note claiming otherwise.
Signed-off-by: Ronnie
From: Ronnie Sahlberg sahlb...@google.com
Date: Wed, 16 Jul 2014 11:20:36 -0700
This behaves like unlink_or_warn except that on failure it writes the message
to its 'err' argument, which the caller can display in an appropriate way or
ignore.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
From: Ronnie Sahlberg sahlb...@google.com
Date: Thu, 15 May 2014 08:25:23 -0700
Add an err argument to delete_ref_loose so that we can pass a descriptive
error string back to the caller. Pass the err argument from transaction
commit to this function so that transaction users will have a nice
From: Ronnie Sahlberg sahlb...@google.com
Date: Wed, 30 Apr 2014 12:22:42 -0700
Change the ref transaction API so that we pass the reflog message to the
create/delete/update functions instead of to ref_transaction_commit.
This allows different reflog messages for each ref update in a multi-ref
From: Ronnie Sahlberg sahlb...@google.com
Date: Wed, 30 Apr 2014 12:41:04 -0700
We call read_ref_full with a pointer to flags from rename_ref but since
we never actually use the returned flags we can just pass NULL here instead.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
Reviewed-by:
From: Ronnie Sahlberg sahlb...@google.com
Date: Thu, 1 May 2014 10:43:39 -0700
Skip using the lock_any_ref_for_update wrapper and call lock_ref_sha1_basic
directly from the commit function.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
Reviewed-by: Michael Haggerty mhag...@alum.mit.edu
From: Ronnie Sahlberg sahlb...@google.com
Date: Thu, 1 May 2014 10:40:10 -0700
Move the check for check_refname_format from lock_any_ref_for_update to
lock_ref_sha1_basic. At some later stage we will get rid of
lock_any_ref_for_update completely. This has no visible impact to callers
except for
From: Ronnie Sahlberg sahlb...@google.com
Date: Thu, 1 May 2014 11:16:07 -0700
Change is_refname_available to take a list of strings to exclude when
checking for conflicts instead of just one single name. We can already
exclude a single name for the sake of renames. This generalizes that support.
From: Ronnie Sahlberg sahlb...@google.com
Date: Fri, 16 May 2014 14:14:38 -0700
In _commit, ENOTDIR can happen in the call to lock_ref_sha1_basic, either
when we lstat the new refname or if the name checking function reports that
the same type of conflict happened. In both cases, it means that
From: Ronnie Sahlberg sahlb...@google.com
Date: Mon, 28 Apr 2014 13:49:07 -0700
Change s_update_ref to use a ref transaction for the ref update.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
builtin/fetch.c | 34
From: Ronnie Sahlberg sahlb...@google.com
Date: Mon, 28 Apr 2014 15:36:58 -0700
No external users call write_ref_sha1 any more so let's declare it static.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
---
refs.c | 10 --
refs.h | 3
From: Ronnie Sahlberg sahlb...@google.com
Date: Tue, 15 Jul 2014 12:59:36 -0700
resolve_ref_unsafe takes a boolean argument for reading (a nonexistent ref
resolves successfully for writing but not for reading). Change this to be
a flags field instead, and pass the new constant
Date: Wed, 10 Sep 2014 18:22:48 -0700
If a repository gets in a broken state with too much symref nesting,
it cannot be repaired with git branch -d:
$ git symbolic-ref refs/heads/nonsense refs/heads/nonsense
$ git branch -d nonsense
error: branch 'nonsense' not found.
Worse, git update-ref
From: Junio C Hamano gits...@pobox.com
Date: Sat, 13 Sep 2014 10:52:25 -0700
A proposed patch produced broken HEAD reflog entries when checking out
anything other than a branch. The testsuite still passed, so it took
a few days for the bug to be noticed.
Add tests checking the content of the
Date: Fri, 26 Sep 2014 12:22:22 -0700
Since v1.7.9-rc1~10^2 (write_head_info(): handle extra refs locally,
2012-01-06), this trick to keep track of .have refs that are only
valid on the wire and not on the filesystem is not needed any more.
Simplify by removing support for the
From: Ronnie Sahlberg sahlb...@google.com
Date: Thu, 11 Sep 2014 10:34:36 -0700
When git branch -d reads the branch it is about to delete, it used
to avoid passing the RESOLVE_REF_READING ('treat missing ref as
error') flag because a symref pointing to a nonexistent ref would show
up as missing
From: Ronnie Sahlberg sahlb...@google.com
Date: Thu, 25 Sep 2014 15:02:39 -0700
There's no straightforward way to grep for all tests dealing with
invalid refs. Put them in a single test script so it is easy to see
what functionality has not been exercised with bad ref names yet.
Signed-off-by:
From: Ronnie Sahlberg sahlb...@google.com
Date: Wed, 3 Sep 2014 11:45:43 -0700
We currently do not handle badly named refs well:
$ cp .git/refs/heads/master .git/refs/heads/master.@\*@\\.
$ git branch
fatal: Reference has invalid format: 'refs/heads/master.@*@\.'
$ git branch
From: Ronnie Sahlberg sahlb...@google.com
Date: Thu, 11 Sep 2014 08:42:57 -0700
Until v2.1.0-rc0~22^2~11 (refs.c: add an err argument to
repack_without_refs, 2014-06-20), repack_without_refs forgot to
provide an error message when commit_packed_refs fails. Even today,
it only provides a message
Date: Thu, 28 Aug 2014 16:42:37 -0700
Some functions that take a strbuf argument to append an error treat
!err as an indication that the message should be suppressed (e.g.,
ref_update_reject_duplicates). Others write the message to stderr on
!err (e.g., repack_without_refs). Others crash (e.g.,
From: Ronnie Sahlberg sahlb...@google.com
Date: Fri, 5 Sep 2014 14:35:17 -0700
Print a warning message for any bad ref names we find in the repo and
skip them so callers don't have to deal with parsing them.
It might be useful in the future to have a flag where we would not
skip these refs for
Date: Thu, 28 Aug 2014 17:01:35 -0700
When removal of a loose or packed ref fails, bail out instead of
trying to finish the transaction. This way, a single error message
can be printed (instead of multiple messages being concatenated by
mistake) and the operator can try to solve the underlying
Date: Thu, 28 Aug 2014 16:41:34 -0700
The former caller uses unable_to_lock_message now.
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
Reviewed-by: Ronnie Sahlberg sahlb...@google.com
---
lockfile.c | 10 --
lockfile.h | 1 -
2 files changed, 11 deletions(-)
diff --git
Hello,
It seems that support of --output by meld is performed by grepping
its help output. However with meld 3.12 I get
$ meld --help
Usage:
meld [OPTION...]
Help Options:
-h, --help Show help options
--help-all Show all help options
--help-gtk
On Tue, Oct 14, 2014 at 10:08:19AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
On Sat, Oct 11, 2014 at 11:37:32PM +, brian m. carlson wrote:
Specifically I'm not excited about getting into a state where we have to
maintain both an asciidoc.conf file _and_ ruby
Hi Michael:
Good Morning. :)
I see mh/lockfile and mh/lockfile-stdio were graduated to master.
So. does this patch continue?
On top of mh/lockfile-stdio?
Thank you. ^_^
Yue Lin Ho
--
View this message in context:
Optionally set __git_ps1 to display nothing when present working
directory is ignored, triggered by the new environmental variable
GIT_PS1_HIDE_IF_PWD_IGNORED. This environmental variable may be
overridden on any repository by setting bash.hideIfPwdIgnored to
false. In the absence of
git version 1.9.1 version 2.1.2
I had some changes in a tracked file that I wanted to discard.
Instead of using checkout, I instead used `git reset --hard HEAD` to reset.
Git returned the message `HEAD is now at sha commit-message`
I then went `git status` and it showed me that I still have
I'd like to rescind my bug report.
A bit more further investigation revealed that git was detecting the
file with changes as jquery.datatables.js but the file in my directory
was reported as being named jquery.dataTables.js .
I'm currently working on OS X 10.9, and this issue is probably
66 matches
Mail list logo
