Jeff King 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 line "unsubscr
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
On Sat, Mar 23, 2013 at 5:04 AM, Jeff King wrote:
> On Sat, Mar 23, 2013 at 06:58:48AM +0100, Thomas Rast wrote:
>> Eric Sunshine writes:
>> > On Thu, Mar 21, 2013 at 8:52 AM, Thomas Rast wrote:
>> >> This is a bit hacky and should really be replaced by equivalent
>> >> support in --follow, and
Ramkumar Ramachandra 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 t
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 wrote:
> >
> > According to 47ec794, this initialization is meant to
> > squelch an erroneous uninitialized variable warning from gcc
> > 4.0.1. That version is quite old at this point, a
On Sat, Mar 23, 2013 at 09:55:53PM -0700, Junio C Hamano wrote:
> René Scharfe 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 my biased opinion.
>
From: "W. Trevor King"
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 fixes that by
addin
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
git-me
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, a
Update style to match Documentation/CodingGuidelines.
Signed-off-by: Kevin Bracey
---
git-merge-one-file.sh | 26 +-
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 255c07a..2382b1f 100755
--- a/git-merge-
Signed-off-by: Kevin Bracey
---
git-merge-one-file.sh | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 2382b1f..39b7799 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -69,7 +69,7 @@ case "${1:
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 hav
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 fl
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 m
On Sun, Mar 24, 2013 at 1:19 AM, Junio C Hamano 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 people seem to l
On Sun, Mar 24, 2013 at 8:36 AM, John Keeping 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 was describing
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.
Unfo
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 wrote:
>>>
>>> According to 47ec794, this initialization is meant to
>>> squelch an erroneous uninitialized variable warning from gcc
>>> 4.0.1. T
On Sun, Mar 24, 2013 at 09:31:45AM -0400, Matt McClure wrote:
> On Sun, Mar 24, 2013 at 8:36 AM, John Keeping 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 ou
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 u
Junio C Hamano wrote:
> Ramkumar Ramachandra 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
>>
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 t
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 an
On Sun, Mar 24, 2013 at 7:31 PM, Jeff King 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 were in fact
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 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 wor
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 probabl
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
---
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 +-
1 file changed, 1
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
---
contrib/subtree/git-subtree.sh | 14 +++---
1 file changed, 7 i
Options to echo are not portable. In particular, the echo -e option is
implemented by some shells, including bash, to expand escape sequences.
Use the printf command instead, which is portable and much more reliable.
Only instances of echo and say (a wrapper for echo) where they are used
with opt
git-subtree is considered to be a Bash only script and not POSIX
compatibile.
I removed the /bin/bash and tested with dash. All the tests
passed.
I also followed some of the advice found in
https://wiki.ubuntu.com/DashAsBinSh for converting a bash script to be
more portable.
Paul Campbell (3)
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 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 extension from gi
On Mon, Mar 11, 2013 at 3:24 AM, Junio C Hamano wrote:
> Paul Campbell writes:
>
>> From: Matt Hoffman
>>
>> The repository and branch of a subtree added with the add command is
>> stored in the .gittrees file.
>>
>> Signed-off-by: Paul Campbell
>> ---
>> contrib/subtree/git-subtree.sh | 8 +++
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 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, thanks :
From: Matt Hoffman
The repository and branch of a subtree added with the add command is
stored in the .gittrees file.
Signed-off-by: Paul Campbell
---
Rerolled allowing for $IFS whitespace.
contrib/subtree/git-subtree.sh | 8
1 file changed, 8 insertions(+)
diff --git a/contrib/sub
Converts a git-submodule into a git-subtree.
Based-on-patch-by: Peter Jaros
Signed-off-by: Paul Campbell
---
contrib/subtree/git-subtree.sh | 37 +++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree
On Fri, Mar 22, 2013 at 6:36 PM, John Szakmeister wrote:
> On Fri, Mar 22, 2013 at 12:19 PM, Timo Sand 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 using iTerm2 and there doesn't s
Please find some patches to use test_config/test_unconfig
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Additionally, instead of
git config ""
or
git confi
test_config is provided by the test library,
a private version is not needed.
Signed-off-by: Yann Droneaud
---
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
--- a/t/t4018-diff-fun
test_config is provided by the test library,
a private version is not needed.
Signed-off-by: Yann Droneaud
---
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
+++ b/t/t7810-grep.sh
@@ -1
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t3400-rebase.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --g
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Additionally, instead of
git config ""
or
git config --unset
uses
test_unconfig
The latter doesn't f
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t7508-status.sh | 46 --
1 file chang
Ramkumar Ramachandra wrote:
> Junio C Hamano wrote:
>> Ramkumar Ramachandra writes:
>>
> + elif test "$autostash" = false
> + then
> require_clean_work_tree "pull with rebase" "Please commit
> or stash them."
> fi
A safety net, after you r
From: Paul Campbell
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
Signed-off-by: Simon Ruderich
---
On Sun, Mar 24, 2013 at 07:37:42PM +, Paul Campbell wrote
On Mon, Mar 11, 2013 at 3:35 AM, Junio C Hamano wrote:
>> From: bibendi
>>
>> 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 git-submodule
>> uses the
test_config is provided by the test library,
a private version is not needed.
Signed-off-by: Yann Droneaud
---
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
--- a/t/t7811-grep-open.sh
+++ b/t
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t5541-http-push.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t9500-gitweb-standalone-no-errors.sh | 3 +--
1 file changed, 1 insertion(+), 2 d
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Tests are modified to assume correct (default) configuration at entry,
and to reset the modified configuration variabl
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t7502-commit.sh | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
di
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t7500-commit.sh | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Additionally, instead of
git config ""
or
git config --unset
uses
test_unconfig
The latter doesn't f
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t5520-pull.sh | 12
1 file changed, 4 insertions(+), 8 deletions(-)
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
---
t/t7502-commit.sh | 32 ++--
1 file changed, 6 insertions(+), 26 deletions(-)
dif
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Tests are modified to assume default configuration at entry,
and to reset the modified configuration variables at the
On Sun, Mar 24, 2013 at 5:36 AM, John Keeping 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.
>>
>> Questiona
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
issue
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 co
On Mon, Mar 25, 2013 at 1:17 AM, Jonathan Nieder wrote:
>> +--sparse::
>> + In sparse checkout mode, `git checkout -- ` would
>> + update all entries matched by regardless sparse
>> + patterns. This option only updates entries matched by
>> + and sparse patterns.
>
> Hm, should t
Duy Nguyen wrote:
> On Mon, Mar 25, 2013 at 1:17 AM, Jonathan Nieder 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 che
The newest craze inside components and also diamond jewelry will be
[url=http://www.cheappandorabuyshop.co.uk/] pandora uk[/url] . Beaded
Diamond jewelry continues to be approved my own folks around the globe for
the basic components but complexity and also complexities inside layout.
Diamond je
I think the fix is something like this. There is still one thing I'd
like to do: make this code not rely on NUL for terminating the
patterns. That should remove the ugly "p[len] = '\0'" in
prepare_attr_stack() 4/4 and and the reallocation in add_exclude() (in
current code). But let's deal with the
This may be helpful when we just want to match a part of "text".
nwildmatch can be used for this purpose.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
wildmatch.c | 43 +--
wildmatch.h | 11 +--
2 files changed, 34 insertions(+), 20 deletions(-)
diff -
When parse_exclude_pattern detects EXC_FLAG_MUSTBEDIR, it sets
patternlen _not_ to include the trailing slash and expects the caller
to trim it. Of the two callers, add_exclude() does, parse_attr_line()
does not.
Because of that, after parse_attr_line() returns, we may have pattern
"foo/" but its
When match_basename was split out of excluded_from_list in 593cb88
(exclude: split basename matching code into a separate function -
2012-10-15), it took basenamelen only as a hint. basename was required
to be NUL-terminated at the given length.
This was fine until match_basename had a new caller
The story goes back to 94bc671 (Add directory pattern matching to
attributes - 2012-12-08). Before this commit, directories are passed
to path_matches without the trailing slash. This is fine for matching
pattern "subdir" with "foo/subdir".
Patterns like "subdir/" (i.e. match _directory_ subdir) w
--
Cheers,
Huajian.
--
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
69 matches
Mail list logo
