tiffany jewellery http://www.buytiffanyandcostore.co.uk possesses
currently employed brand names you'll find singular person in be anxious in
addition to build a a lot of unique a number of earrings just as usual
sterling silver armlet to help sterling silver necklaces earrings. For
anyone who
[url=http://www.cheappandorabuyshop.co.uk/] pandora charms[/url] is regarded
to bring enjoy in addition to fend off awful sprits or maybe vibrations. The
majority of the early cultures originating in early Egypt,
The indian subcontinent, China and taiwan, A holiday in greece in addition
to
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
Thomas Rast tr...@student.ethz.ch writes:
To save the user a lookup of the last line number, introduce $ as a
shorthand for the last line. This is mostly useful to spell until
the end of the file as
On Tue, Mar 12, 2013 at 5:17 PM, John Keeping j...@keeping.me.uk wrote:
On Tue, Mar 12, 2013 at 04:48:16PM -0600, Matt McClure wrote:
On Mar 12, 2013, at 4:16 PM, Junio C Hamano gits...@pobox.com wrote:
Matt McClure matthewlmccl...@gmail.com writes:
* If you are comparing two trees, and
Jeff King p...@peff.net writes:
This behavior is due to change in the future, but let's test
it anyway.
Thanks. This should be merged regardless of PATCH 2/2 I think.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line unsubscribe git in
the body
Benötigen Sie Finanzierung? Wir bieten direkte Finanzierung von bis zu 100
Millionen an erschwingliche Preise. Unsere zuverlässige und bequeme
Finanzierung Dienstleistungen umfassen:- Konventionelle und persönliche
Finanzierung für Einzelpersonen; Kommerzieller Begriff Darlehen für mittleren
On Tue, Mar 12, 2013 at 6:12 PM, Kevin Bracey ke...@bracey.fi wrote:
Commit 718135e improved the merge error reporting for the resolve
strategy's merge conflict and permission conflict cases, but led to a
malformed ERROR: in myfile.c message in the case of a file added
differently.
This
Jeff King p...@peff.net writes:
For users who have read and accepted the warning, there is no way to
jump directly to the future behavior and silence the warning.
I think the idea makes sense. The transition period is necessary for
people who use different versions of Git (which includes
On Tue, Mar 12, 2013 at 08:26:21PM -0400, Matt McClure wrote:
On Tue, Mar 12, 2013 at 3:24 PM, John Keeping j...@keeping.me.uk wrote:
If so I think you want some new mode of operation for difftool instead
of this patch which will also affect unrelated commands.
Are you suggesting that
Phil Hord venit, vidit, dixit 13.03.2013 05:21:
On Tue, Mar 12, 2013 at 11:33 PM, Junio C Hamano gits...@pobox.com wrote:
Phil Hord ho...@cisco.com writes:
git tag --force is used to replace an existing tag with
a new reference. Git helpfully tells the user the old
ref when this happens.
On Wed, Mar 13, 2013 at 10:07:34AM +0100, Matthieu Moy wrote:
Jeff King p...@peff.net writes:
For users who have read and accepted the warning, there is no way to
jump directly to the future behavior and silence the warning.
I think the idea makes sense. The transition period is
This round fixes the design issue of read_and_strip_branch(), makes
use of jc/reflog-reverse-walk and performs cheaper sha-1 check on
detached commits.
Nguyễn Thái Ngọc Duy (5):
wt-status: move strbuf into read_and_strip_branch()
wt-status: split wt_status_state parsing function out
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
wt-status.c | 65 -
wt-status.h | 4 ++--
2 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index ef405d0..6cac27b 100644
---
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
wt-status.c | 41 +++--
wt-status.h | 1 +
2 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index 6cac27b..0d8989f 100644
--- a/wt-status.c
+++ b/wt-status.c
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
wt-status.c | 39 ---
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index 0d8989f..17690d8 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1033,32 +1033,30 @@
When a remote ref or a tag is checked out, HEAD is automatically
detached. There is no user-friendly way to find out what ref is
checked out in this case. This patch digs in reflog for this
information and shows HEAD detached from origin/master or HEAD
detached at v1.8.0 instead of currently not
This prints more helpful info when HEAD is detached: is it detached
because of bisect or rebase? What is the original branch name in those
cases? Is it detached because the user checks out a remote ref or a
tag (and which one)?
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
This patch attempts to advertise -uno to the users who tolerate slow
git status on large repositories (or slow machines/disks). The 2
seconds limit is quite arbitrary but is probably long enough to start
using -uno.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
When a rename conflict occurs, the information about the conflict is
written to stdout and the index is updated as if the conflict were a
simpler conflict that did not involve renames. This doesn't give a lot of
information to users after the fact - a status of added in ours does not
provide a
I have been working on the pack-refs code [1] and noticed what looks
like a problem with the handling of peeled refs in the packed-refs file
and in the reference cache. In particular, the peeled versions of tags
outside of refs/tags are *not* stored in packed-refs, but after the
packed-refs file
On 13.03.13 13:59, Nguyễn Thái Ngọc Duy wrote:
This patch attempts to advertise -uno to the users who tolerate slow
git status on large repositories (or slow machines/disks). The 2
seconds limit is quite arbitrary but is probably long enough to start
using -uno.
Signed-off-by: Nguyễn Thái
On Wed, Mar 13, 2013 at 4:24 AM, David Aguilar dav...@gmail.com wrote:
This is a nice straightforward approach.
As Junio mentioned, a good next step would be this patch
in combination with making the truly temporary files
created by dir-diff readonly.
Will that need a win32 platform check?
David Aguilar dav...@gmail.com writes:
The implementation of Junio's suggestion is relatively straightforward
(this is untested, although t7800 passes, and can probably be improved
by someone better versed in Perl). Does this work for your original
scenario?
This is a nice straightforward
On 03/13/2013 03:59 PM, Michael Haggerty wrote:
I have been working on the pack-refs code [1] and noticed what looks
like a problem with the handling of peeled refs in the packed-refs file
and in the reference cache. In particular, the peeled versions of tags
outside of refs/tags are *not*
Jeff King p...@peff.net writes:
Your patch doesn't advertise the option in the warning message, which I
think is good. You may mention it the commit message that this is a
deliberate choice.
Yes, it was deliberate. I can add a note.
+add.updateroot::
Detail: option names are normally
On Wed, Mar 13, 2013 at 11:21:40AM -0400, Matt McClure wrote:
On Wed, Mar 13, 2013 at 4:24 AM, David Aguilar dav...@gmail.com wrote:
This is a nice straightforward approach.
As Junio mentioned, a good next step would be this patch
in combination with making the truly temporary files
Thomas Rast tr...@inf.ethz.ch writes:
Even though I am moving from builtin/blame.c to line-log.c? I would
otherwise have to call from a rather lib-ish file into a front
You haven't sent any reply to this. Does that mean you agree? Would
you prefer the shared file to be named something
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
diff --git a/Documentation/config.txt b/Documentation/config.txt
index bbba728..e91d06f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -178,6 +178,10 @@ advice.*::
the template shown when writing commit
One common use-case for git subtree is to use it only on taged commits from the
remote project. however the current implementation of gi-subtree can not be
used in that way. two orthogonal prevent this
the SHA used as the origin revision can be the SHA of a tag which isn't
available locally.
When adding or merging the first parameter might not be a commit, it can also
be a tag SHA.
This needs to be fixed by using the underlying commit or the ancestor finding
code will croak at split time
Signed-off-by: Jérémy Rosen jeremy.ro...@openwide.fr
---
contrib/subtree/git-subtree.sh |
ls-remote is the correct way to check that a parameter is a valid fetchable
target
Signed-off-by: Jérémy Rosen jeremy.ro...@openwide.fr
---
contrib/subtree/git-subtree.sh | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
You do not have anything to say above the S-o-b line? The primary
effect of this patch is to change the lifespan and ownership rule of
the piece of memory used for state.branch/state.onto and
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
When a remote ref or a tag is checked out, HEAD is automatically
detached. There is no user-friendly way to find out what ref is
checked out in this case. This patch digs in reflog for this
information and shows HEAD detached from origin/master
Junio C Hamano gits...@pobox.com writes:
David Aguilar dav...@gmail.com writes:
The implementation of Junio's suggestion is relatively straightforward
(this is untested, although t7800 passes, and can probably be improved
by someone better versed in Perl). Does this work for your original
I recently tried to apply a patch-series to a repo that is
unfortunately full of CRLF files, and was a bit surprised that it
didn't work at all.
So I made a small repro-case, and it seems CRLF new-lines is indeed
the problem. Any clue how to fix it? The way I see it, we should
simply be able top
On Wed, Mar 13, 2013 at 09:45:47AM -0700, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com writes:
David Aguilar dav...@gmail.com writes:
The implementation of Junio's suggestion is relatively straightforward
(this is untested, although t7800 passes, and can probably be improved
Michael Haggerty mhag...@alum.mit.edu writes:
It is not
clear to me whether the prohibition of tags outside of refs/tags should
be made more airtight or whether the peeling of tags outside of
refs/tags should be fixed.
Retroactively forbidding presense/creation of tags outside the
designated
John Keeping j...@keeping.me.uk writes:
git-hash-object(1) implies that it will apply the clean filter and EOL
conversion when it's given a path to a file in the working tree (as it
is here). Is that not the case?
Applying clean to smudged contents _ought to_ recover clean version,
but is
On Wed, Mar 13, 2013 at 9:54 AM, Erik Faye-Lund kusmab...@gmail.com wrote:
I recently tried to apply a patch-series to a repo that is
unfortunately full of CRLF files, and was a bit surprised that it
didn't work at all.
So I made a small repro-case, and it seems CRLF new-lines is indeed
the
Jeff King p...@peff.net writes:
We didn't seem to be testing this transition at all. I think it's sane
to do so now, and Junio's now it is 2.0, let's switch patch should
update the test.
Yes, but I am not sure if this is testing the right thing.
+# Note that this is scheduled to change in
On Wed, Mar 13, 2013 at 6:42 PM, Brandon Casey draf...@gmail.com wrote:
On Wed, Mar 13, 2013 at 9:54 AM, Erik Faye-Lund kusmab...@gmail.com wrote:
I recently tried to apply a patch-series to a repo that is
unfortunately full of CRLF files, and was a bit surprised that it
didn't work at all.
Am 13.03.2013 02:03, schrieb Duy Nguyen:
On Wed, Mar 13, 2013 at 6:21 AM, Karsten Blees karsten.bl...@gmail.com
wrote:
Hmmm...I don't see how filesystem changes since last invocation can solve
the problem, or am I missing something? I think what you mean to say is that
the daemon should
By default, newly added binary files are exclusively locked by Perforce:
'add default change (binary+l) *exclusive*'
This results in a 'Could not determine file type' error as the regex
expects
the line to end after the file type matching group. Some repositories are
also configured to always
Kevin Bracey ke...@bracey.fi writes:
Commit 718135e improved the merge error reporting for the resolve
strategy's merge conflict and permission conflict cases, but led to a
malformed ERROR: in myfile.c message in the case of a file added
differently.
This commit reverts that change, and
On Wed, Mar 13, 2013 at 10:40:55AM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
git-hash-object(1) implies that it will apply the clean filter and EOL
conversion when it's given a path to a file in the working tree (as it
is here). Is that not the case?
Edward Thomson ethom...@microsoft.com writes:
I would propose that we store the data about the file in conflict as it
occurred through the renames. For example, in a rename 1-2 conflict where
A was renamed to both B and C, you would have a single conflict entry
containing the data for A, B
John Keeping j...@keeping.me.uk writes:
On Wed, Mar 13, 2013 at 10:40:55AM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
git-hash-object(1) implies that it will apply the clean filter and EOL
conversion when it's given a path to a file in the working tree (as it
Karsten Blees karsten.bl...@gmail.com writes:
However, AFAIK inotify doesn't work recursively, so the daemon
would at least have to track the directory structure to be able to
register / unregister inotify handlers as directories come and go.
Yes, and you would need one inotify per directory
Hello,
When I delete a git repo that I have cloned on my machine using 'rm -rf
repo-name' I get an incorrect block count when I attempt a Disk Repair.
I am running OS X 10.8.2 on a user installed SSD. The git version is 1.8.1.5.
Checking file systemChecking Journaled HFS Plus volume.
Detected
The latest feature release Git v1.8.2 is now available at the
usual places.
The release tarballs are found at:
http://code.google.com/p/git-core/downloads/list
and their SHA-1 checksums are:
42960ec7c2d8404af3d3f6d21f32f1e97e6e0a96 git-1.8.2.tar.gz
db1ca968f492f7ad1d4e0c13d07f23c745d10b74
Welcome to the Git development community.
This message is written by the maintainer and talks about how Git
project is managed, and how you can work with it.
* Mailing list and the community
The development is primarily done on the Git mailing list. Help
requests, feature proposals, bug reports
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The tip of the master is at v1.8.2. We have already many topics
lined up for the next cycle, so after a few days to calm down, we
will see
Here's the proper patch. It grew into a series because I noticed a
minor formatting error in the difftool documentation, which the first
commit fixes.
The content of the second patch is the same as was previously posted.
John Keeping (2):
git-difftool(1): fix formatting of --symlink
Signed-off-by: John Keeping j...@keeping.me.uk
---
Documentation/git-difftool.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index e0e12e9..e575fea 100644
--- a/Documentation/git-difftool.txt
+++
Some users like to edit files in their diff tool when using git
difftool --dir-diff --symlink to compare against the working tree but
difftool currently only created symlinks when a file contains unstaged
changes.
Change this behaviour so that symlinks are created whenever the
right-hand side of
Junio C Hamano [mailto:gits...@pobox.com] wrote:
I do not offhand see anything particularly stupid; a new optional index
extension
section CACHE_EXT_RENAME_CONFLICT might be a good addition.
Is one side moves A to B while the other side moves it to C the only case,
or is
it just an
Currently, it's not possible to use the space-ignoring options (-b, -w,
--ignore-space-at-eol) with combined diff. It makes it pretty impossible
to read a merge between a branch that changed all tabs to spaces, and a
branch with functional changes.
Pass diff flags to diff engine, so that combined
On Wed, Mar 13, 2013 at 10:29:54AM -0700, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
It is not
clear to me whether the prohibition of tags outside of refs/tags should
be made more airtight or whether the peeling of tags outside of
refs/tags should be fixed.
On Wed, Mar 13, 2013 at 11:45 AM, Ismail Tabtabai itabta...@me.com wrote:
Hello,
When I delete a git repo that I have cloned on my machine using 'rm -rf
repo-name' I get an incorrect block count when I attempt a Disk Repair.
I am running OS X 10.8.2 on a user installed SSD. The git version
On Wed, Mar 13, 2013 at 11:48 AM, Øystein Walle oys...@gmail.com wrote:
When a merge is ongoing and there are conflicts, 'git difftool' will
output the exact same --cc-style diff output as 'git diff' will without
further explanation. This has lead to some confusion: A couple of weeks
ago a
Less ambitious patch series this time.
James and Michael's patches add if clauses that use the
bashism 'if []' rather than 'if test'. I've left them as
they are to match the other if clauses within the
git-subtree.sh file. I remember reading a comment on the
list about matching the local style
From: Michael Hart mich...@adslot.com
If the subtree split fails it doesn't return the SHA that should be
pushed to the other repository.
Added a check to ensure that split succeeds before trying to push
and display an error message.
Signed-off-by: Paul Campbell pcampb...@kemitix.net
---
From: James Roper jro...@vz.net
Allow the --force option to be passed to the child push command.
Signed-off-by: Paul Campbell pcampb...@kemitix.net
---
contrib/subtree/git-subtree.sh | 9 -
contrib/subtree/git-subtree.txt | 5 +
2 files changed, 13 insertions(+), 1 deletion(-)
From: Paul Cartwright paul.cartwri...@ziilabs.com
Signed-off-by: Paul Campbell pcampb...@kemitix.net
---
contrib/subtree/git-subtree.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 97dd3c9..e1bfa61
From: Matt Hoffman matt.hoff...@quantumretail.com
The ctrl-M (^M) character used for the carriage return (CR) is not visible
in all (most) text editors and is often silently converted to a new
line (NL) or CR/NL combo.
'say' is a wrapper for echo with accepts the option -e to interperet
escaped
On Wed, Mar 13, 2013 at 10:32 PM, Paul Campbell pcampb...@kemitix.net wrote:
From: Matt Hoffman matt.hoff...@quantumretail.com
The ctrl-M (^M) character used for the carriage return (CR) is not visible
in all (most) text editors and is often silently converted to a new
line (NL) or CR/NL
From: Matt Hoffman matt.hoff...@quantumretail.com
The ctrl-M (^M) character used for the carriage return (CR) is not visible
in all (most) text editors and is often silently converted to a new
line (NL) or CR/NL combo.
'say' is a wrapper for echo with accepts the option -e to interperet
escaped
Antoine Pelisse apeli...@gmail.com writes:
Currently, it's not possible to use the space-ignoring options (-b, -w,
--ignore-space-at-eol) with combined diff. It makes it pretty impossible
to read a merge between a branch that changed all tabs to spaces, and a
branch with functional changes.
Antoine Pelisse apeli...@gmail.com writes:
OK, I added some tests and coalesce similar lost lines (using the same flags
we used for diff.
Hmph, why doesn't this pass its own tests?
+test_expect_success 'check combined output (no ignore space)' '
+ git show | test_i18ngrep ^-\s*eol
Hi!
I wanted to let you know about git-arr, which is a git repository
browser that can generate static HTML instead of having to run
dynamically.
It is smaller, with less features and a different set of tradeoffs than
gitweb or cgit, but if you have a reduced environment, the static
generation
binPHkdTDR1Av.bin
Description: iso-8859-1
Only check for ',' explicitly and handle both ')' and '\0' in the else
branch. strcspn() can only return ',', ')' and '\0' at this point so the
new code is completely equivalent to what we had before.
This also fixes following GCC warning:
setup.c: In function ‘get_pathspec’:
Paul Campbell pcampb...@kemitix.net writes:
James and Michael's patches add if clauses that use the
bashism 'if []' rather than 'if test'.
Bashism...? I dunno how portable is, but [ is an old unix alias
for test ... it certainly predates bash...
-miles
--
Occam's razor split hairs so well,
On 03/13/2013 10:58 PM, Jeff King wrote:
On Wed, Mar 13, 2013 at 10:29:54AM -0700, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
It is not
clear to me whether the prohibition of tags outside of refs/tags should
be made more airtight or whether the peeling of tags
On Thu, Mar 14, 2013 at 05:41:58AM +0100, Michael Haggerty wrote:
Here is analysis of our options as I see them:
1. Accept that tags outside of refs/tags are not reliably advertised in
their peeled form. Document this deficiency and either:
a. Don't even bother trying to peel refs
On Thu, Mar 14, 2013 at 01:24:48AM -0400, Jeff King wrote:
So the only question is how much work we want to put into making sure
the new reader handles the old writer correctly. Doing 2c is obviously
more rigorous, and it is not that much work to add the fully-packed
flag, but I kind of
76 matches
Mail list logo
