On Sun, Mar 24, 2013 at 1:06 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 8edcdca..45a2b53 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -180,6 +180,13 @@ branch by
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
---
Junio, this patch clearly conflicts wih nd/magic-pathspecs. Do you
want me to:
- hold it off until nd/magic-pathspecs graduates
- rebase on top of nd/magic-pathspecs and repost
- leave it to you to handle conflicts
?
I'd prefer
Thanks.
--
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
Jeff King p...@peff.net writes:
Yeah, I'm not planning to work on this, but I'd be happy to review
patches if somebody else wants to.
I am not planning to work on this, and honestly speaking I would not
be very happy to see any patch in this area.
--
To unsubscribe from this list: send the
On 21.03.13 21:47, Jonathan Nieder wrote:
Jeff King wrote:
And 4.3 was old enough for me to say I do not care if you can run with
-Wall -Werror or not, let alone 4.2.
Changes like this can only reveal bugs (in git or optimizers) that
were hidden before, without regressing actual runtime
On Sat, Mar 23, 2013 at 5:04 AM, Jeff King p...@peff.net wrote:
On Sat, Mar 23, 2013 at 06:58:48AM +0100, Thomas Rast wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
On Thu, Mar 21, 2013 at 8:52 AM, Thomas Rast tr...@student.ethz.ch wrote:
This is a bit hacky and should really be
Ramkumar Ramachandra artag...@gmail.com writes:
+ elif test $autostash = false
+ then
require_clean_work_tree pull with rebase Please commit or
stash them.
fi
A safety net, after you run git stash, to validate that the
added git stash indeed made the working
On Sat, Mar 23, 2013 at 09:55:53PM -0700, Junio C Hamano wrote:
René Scharfe rene.scha...@lsrfire.ath.cx writes:
Hmm, let's see if we can help the compiler follow the code without
making it harder for people to understand. The patch looks a bit
jumbled, but the resulting code is OK in
From: W. Trevor King wk...@tremily.us
6c26bf4 (user-manual: Reorganize the reroll sections, adding 'git
rebase -i', 2013-02-19) used deadbee as the oldest commit in the pick
list, but as the final commit in the rebased range, due to sloppy
duplication and extension from git-rebase.txt. This
Style clean up, as requested, followed by the fix to the both sides added
handling for git-merge-one-file.
This is based on v4 of my p4merge series, as they touch the same area.
Kevin Bracey (3):
git-merge-one-file: style cleanup
git-merge-one-file: send ERROR: messages to stderr
Reverse LOCAL and REMOTE when invoking P4Merge as a mergetool, so that
the incoming branch is now in the left-hand, blue triangle pane, and the
current branch is in the right-hand, green circle pane.
This change makes use of P4Merge consistent with its built-in help, its
reference documentation,
On Sat, Mar 23, 2013 at 10:19:36PM -0700, Junio C Hamano wrote:
In the longer term, difftool probably needs to learn to warn the user
instead of overwrite any changes that have been made to the working tree
file.
Questionable.
Admittedly I do not use difftool myself, and I have long
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 uses an alternative approach without
this
In checkout_paths() we do this
- for all updated items, call match_pathspec
- for all items, call match_pathspec (inside unmerge_cache)
- for all items, call match_pathspec (for showing path .. is unmerged)
- for updated items, call match_pathspec and update paths
That's a lot of duplicate
On Sun, Mar 24, 2013 at 1:19 AM, Junio C Hamano gits...@pobox.com wrote:
Admittedly I do not use difftool myself, and I have long assumed
that difftool users are using the tools to _view_ the changes, but
apparently some of the tools let the user muck with what is shown,
and also apparently
On Sun, Mar 24, 2013 at 8:36 AM, John Keeping j...@keeping.me.uk wrote:
In the
non-symlink case I think a user might find it surprising if the
(unmodified) file used by their diff tool were suddenly copied over the
working tree wiping out the changes they have just made.
That's exactly what I
Originally, with no base, Git gave P4Merge $LOCAL as a dummy base:
p4merge $LOCAL $LOCAL $REMOTE $MERGED
Commit 0a0ec7bd changed this to:
p4merge empty file $LOCAL $REMOTE $MERGED
to avoid the problem of being unable to save in some circumstances with
similar inputs.
Unfortunately this
On 24.03.13 10:32, Jeff King wrote:
On Sat, Mar 23, 2013 at 09:00:05PM -0700, Junio C Hamano wrote:
On Thu, Mar 21, 2013 at 4:13 AM, Jeff King p...@peff.net wrote:
According to 47ec794, this initialization is meant to
squelch an erroneous uninitialized variable warning from gcc
4.0.1.
On Sun, Mar 24, 2013 at 09:31:45AM -0400, Matt McClure wrote:
On Sun, Mar 24, 2013 at 8:36 AM, John Keeping j...@keeping.me.uk wrote:
In the
non-symlink case I think a user might find it surprising if the
(unmodified) file used by their diff tool were suddenly copied over the
working tree
Hi,
I find this behavior very inconsistent and annoying. Why would I want
to commit the submodule change immediately? Maybe I want to batch it
up with other changes and stage it at a later time. Why should I have
to unstage them manually now? I get the other side of the argument:
what if the
Junio C Hamano wrote:
Ramkumar Ramachandra artag...@gmail.com writes:
+ elif test $autostash = false
+ then
require_clean_work_tree pull with rebase Please commit or
stash them.
fi
A safety net, after you run git stash, to validate that the
added git stash
Hi,
Nguyễn Thái Ngọc Duy wrote:
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -180,6 +180,13 @@ branch by running git rm -rf . from the top level of
the working tree.
Afterwards you will be ready to prepare your new files, repopulating the
working tree, by
I saw this post-mortem on recent disk corruption seen on git.kde.org:
http://jefferai.org/2013/03/24/too-perfect-a-mirror/
The interesting bit to me is that object corruption propagated across a
clone (and oddly, that --mirror made complaints about corruption go
away). I did a little testing
On Sun, Mar 24, 2013 at 7:31 PM, Jeff King p...@peff.net wrote:
I don't have details on the KDE corruption, or why it wasn't detected
(if it was one of the cases I mentioned above, or a more subtle issue).
One thing worth mentioning is this part of the article:
Originally, mirrored clones
On Sun, Mar 24, 2013 at 08:01:33PM +0100, Ævar Arnfjörð Bjarmason wrote:
On Sun, Mar 24, 2013 at 7:31 PM, Jeff King p...@peff.net wrote:
I don't have details on the KDE corruption, or why it wasn't detected
(if it was one of the cases I mentioned above, or a more subtle issue).
One
On Sun, Mar 24, 2013 at 02:31:33PM -0400, Jeff King wrote:
Fscking the incoming objects does work, but of course it comes at a cost
in the normal case (for linux-2.6, I measured an increase in CPU time
with index-pack --strict from ~2.5 minutes to ~4 minutes). And I think
it is probably
Don't explicitly use the Bash shell but allow the system to provide a
hopefully POSIX compatible shell at /bin/sh.
Signed-off-by: Paul Campbell pcampb...@kemitix.net
---
Only the system's I was able to test this on (Debian squeeze) /bin/sh is
the dash shell.
contrib/subtree/git-subtree.sh | 2
Use of -a and -o in the [ command can have confusing semantics.
Use a separate test invocation for each single test, combining them with
and ||, and use ordinary parentheses for grouping.
Signed-off-by: Paul Campbell pcampb...@kemitix.net
---
contrib/subtree/git-subtree.sh | 14 +++---
our subversion repository contains various things, which are in
dedicated subdirectories:
trunk/project/code
trunk/project/doc
trunk/project/...
the same is then valid for the branches:
branches/project-1.0/code
branches/project-1.0/doc
branches/project-1.0/...
as there are many folders with big
Hi
On 03/24/2013 07:17 PM, Jonathan Nieder wrote:
Hi,
Nguyễn Thái Ngọc Duy wrote:
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -180,6 +180,13 @@ branch by running git rm -rf . from the top level of the
working tree.
Afterwards you will be ready to prepare
On Sun, Mar 24, 2013 at 8:23 AM, W. Trevor King wk...@tremily.us wrote:
6c26bf4 (user-manual: Reorganize the reroll sections, adding 'git
rebase -i', 2013-02-19) used deadbee as the oldest commit in the pick
list, but as the final commit in the rebased range, due to sloppy
duplication and
On Mon, Mar 11, 2013 at 3:24 AM, Junio C Hamano gits...@pobox.com wrote:
Paul Campbell pcampb...@kemitix.net writes:
From: Matt Hoffman matt.hoff...@quantumretail.com
The repository and branch of a subtree added with the add command is
stored in the .gittrees file.
Signed-off-by: Paul
On Sun, Mar 24, 2013 at 04:00:17PM -0400, Eric Sunshine wrote:
On Sun, Mar 24, 2013 at 8:23 AM, W. Trevor King wk...@tremily.us wrote:
I also reworded the example commit summaries (onelines), because I
think my initial mistake may have been to to misinterpreting this
s/to to/due to/
Oops,
From: Matt Hoffman matt.hoff...@quantumretail.com
The repository and branch of a subtree added with the add command is
stored in the .gittrees file.
Signed-off-by: Paul Campbell pcampb...@kemitix.net
---
Rerolled allowing for $IFS whitespace.
contrib/subtree/git-subtree.sh | 8
1
Converts a git-submodule into a git-subtree.
Based-on-patch-by: Peter Jaros pja...@pivotallabs.com
Signed-off-by: Paul Campbell pcampb...@kemitix.net
---
contrib/subtree/git-subtree.sh | 37 +++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git
On Fri, Mar 22, 2013 at 6:36 PM, John Szakmeister j...@szakmeister.net wrote:
On Fri, Mar 22, 2013 at 12:19 PM, Timo Sand timo.j.s...@gmail.com wrote:
Hi,
well my use case is actually that I'm trying to use the gem
'gem-browse' which uses 'git web--browse'
I'm not using Apple Terminal, I'm
Please find some patches to use test_config/test_unconfig
Instead of using construct such as:
test_when_finished git config --unset key
git config key value
uses
test_config key value
The latter takes care of removing key at the end of the test.
Additionally, instead of
git
test_config is provided by the test library,
a private version is not needed.
Signed-off-by: Yann Droneaud ydrone...@opteya.com
---
t/t4018-diff-funcname.sh | 5 -
1 file changed, 5 deletions(-)
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 082d3e8..38a092a 100755
test_config is provided by the test library,
a private version is not needed.
Signed-off-by: Yann Droneaud ydrone...@opteya.com
---
t/t7810-grep.sh | 5 -
1 file changed, 5 deletions(-)
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index f698001..500eb50 100755
--- a/t/t7810-grep.sh
+++
Instead of using construct such as:
test_when_finished git config --unset key
git config key value
uses
test_config key value
The latter takes care of removing key at the end of the test.
Signed-off-by: Yann Droneaud ydrone...@opteya.com
---
t/t3400-rebase.sh | 3 +--
1 file changed,
Instead of using construct such as:
test_when_finished git config --unset key
git config key value
uses
test_config key value
The latter takes care of removing key at the end of the test.
Additionally, instead of
git config key
or
git config --unset key
uses
Instead of using construct such as:
test_when_finished git config --unset key
git config key value
uses
test_config key value
The latter takes care of removing key at the end of the test.
Signed-off-by: Yann Droneaud ydrone...@opteya.com
---
t/t7508-status.sh | 46
Ramkumar Ramachandra wrote:
Junio C Hamano wrote:
Ramkumar Ramachandra artag...@gmail.com writes:
+ elif test $autostash = false
+ then
require_clean_work_tree pull with rebase Please commit
or stash them.
fi
A safety net, after you run git stash, to validate
From: Paul Campbell pcampb...@kemitix.net
Use of -a and -o in the [ command can have confusing semantics.
Use a separate test invocation for each single test, combining them with
and ||.
Signed-off-by: Paul Campbell pcampb...@kemitix.net
Signed-off-by: Simon Ruderich si...@ruderich.org
---
On
On Mon, Mar 11, 2013 at 3:35 AM, Junio C Hamano gits...@pobox.com wrote:
From: bibendi bibe...@bk.ru
Look in the config file .gittrees for a default repository and
refspec or commit when they are not provided on the command line.
Uses the .gittrees config file in a similar way to how
test_config is provided by the test library,
a private version is not needed.
Signed-off-by: Yann Droneaud ydrone...@opteya.com
---
t/t7811-grep-open.sh | 5 -
1 file changed, 5 deletions(-)
diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index a895778..e1951a5 100755
---
Instead of using construct such as:
test_when_finished git config --unset key
git config key value
uses
test_config key value
The latter takes care of removing key at the end of the test.
Signed-off-by: Yann Droneaud ydrone...@opteya.com
---
t/t5541-http-push.sh | 3 +--
1 file
Instead of using construct such as:
test_when_finished git config --unset key
git config key value
uses
test_config key value
The latter takes care of removing key at the end of the test.
Signed-off-by: Yann Droneaud ydrone...@opteya.com
---
t/t9500-gitweb-standalone-no-errors.sh | 3
Instead of using construct such as:
test_when_finished git config --unset key
git config key value
uses
test_config key value
The latter takes care of removing key at the end of the test.
Tests are modified to assume correct (default) configuration at entry,
and to reset the modified
Instead of using construct such as:
test_when_finished git config --unset key
git config key value
uses
test_config key value
The latter takes care of removing key at the end of the test.
Signed-off-by: Yann Droneaud ydrone...@opteya.com
---
t/t7502-commit.sh | 8 +++-
1 file
Instead of using construct such as:
test_when_finished git config --unset key
git config key value
uses
test_config key value
The latter takes care of removing key at the end of the test.
Signed-off-by: Yann Droneaud ydrone...@opteya.com
---
t/t7500-commit.sh | 6 ++
1 file
Instead of using construct such as:
test_when_finished git config --unset key
git config key value
uses
test_config key value
The latter takes care of removing key at the end of the test.
Additionally, instead of
git config key
or
git config --unset key
uses
Instead of using construct such as:
test_when_finished git config --unset key
git config key value
uses
test_config key value
The latter takes care of removing key at the end of the test.
Signed-off-by: Yann Droneaud ydrone...@opteya.com
---
t/t5520-pull.sh | 12
1 file
Using test_config ensure the configuration variable are removed
at the end of the test, there's no need to remove variable
at the beginning of the test.
Signed-off-by: Yann Droneaud ydrone...@opteya.com
---
t/t7502-commit.sh | 32 ++--
1 file changed, 6 insertions(+),
Instead of using construct such as:
test_when_finished git config --unset key
git config key value
uses
test_config key value
The latter takes care of removing key at the end of the test.
Tests are modified to assume default configuration at entry,
and to reset the modified
On Sun, Mar 24, 2013 at 5:36 AM, John Keeping j...@keeping.me.uk wrote:
On Sat, Mar 23, 2013 at 10:19:36PM -0700, Junio C Hamano wrote:
In the longer term, difftool probably needs to learn to warn the user
instead of overwrite any changes that have been made to the working tree
file.
danny.tho...@blackboard.com wrote on Wed, 20 Mar 2013 07:33 -0400:
Sounds good to me. I've got a couple of busy days coming up, but should
have time this week.
Here's what I'm playing with for test cases, by the way. The fix
you're working on is definitely part of it, but there are more
issues
Am 24.03.2013 05:55, schrieb Junio C Hamano:
However, the same compiler still thinks {elem,path,mode}1 can be
used uninitialized (but not {elem,path,mode}2). The craziness I
reported in the previous message is also the same. With this patch
on top to swap the side we inspect first, the
On Mon, Mar 25, 2013 at 1:17 AM, Jonathan Nieder jrnie...@gmail.com wrote:
+--sparse::
+ In sparse checkout mode, `git checkout -- paths` would
+ update all entries matched by paths regardless sparse
+ patterns. This option only updates entries matched by paths
+ and sparse
Duy Nguyen wrote:
On Mon, Mar 25, 2013 at 1:17 AM, Jonathan Nieder jrnie...@gmail.com wrote:
Hm, should this be the default?
In principle, I would expect
git checkout -- .
to make the worktree match the index, respecting the sparse checkout.
And something like
git
60 matches
Mail list logo
