Junio C Hamano writes:
> Thomas Rast writes:
>
>> Junio's index-v4 was a speed boost mainly because it cuts down on the
>> size of the index. Do we want to throw that out?
>
> That's pretty much orthogonal, isn't it?
>
> The index-v4 is merely to show how a stupid prefix compression of
> pathna
Junio C Hamano writes:
> Jonathan Nieder writes:
>
>> Before this patch, it says
>>
>> The --binary option has been a no-op for a long time, and ...
>>
>> After the patch, it says
>>
>> The -b option has been a no-op for a long time, and ...
>>
>> Intentional? That may be a good chang
On Tuesday 24 July 2012 14:50:49 Jonathan Nieder wrote:
> > It is unclear how this is different from giving the ceiling by
> > specifying it as the "END" in -rSTART:END command line. Is this
> > feature really needed?
>
> I think the idea is that you put this script (or a symlink to it) on
> your
On 2012.7.24 10:54 PM, Jonathan Nieder wrote:
>> And again, it *does not have to be zero sum*. It doesn't have to be email VS
>> GUI. You can have your cake and eat it too.
>
> I assume you're talking about web-based interfaces that have gateways
> to email, that produce inboxes like this:
>
>
Keep the temporary directory around when either compare() or
the difftool returns a non-zero exit status.
Tell the user about the location of the temporary files so that
they can recover from the failure.
Signed-off-by: David Aguilar
---
git-difftool.perl | 36 ++
From: "Michael G. Schwern"
Also it can compile on its own now, yay!
---
git-svn.perl | 4
perl/Git/SVN.pm | 9 +++--
t/Git-SVN/00compile.t | 3 ++-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 4c77f69..ef10f6f 100755
---
From: "Michael G. Schwern"
This means it should be able to load without git-svn being loaded.
* Load Git.pm on its own and all the needed command functions.
* It needs to grab at a git-svn lexical $_prefix representing the --prefix
option. Provide opt_prefix() for that. This is a refactorin
From: "Michael G. Schwern"
Put them in a new module called Git::SVN::Utils. Yeah, not terribly
original and it will be a dumping ground. But its better than having
them in the main git-svn program. At least they can be documented
and tested.
* fatal() is used by many classes.
* Change the $ca
This is a refactoring to move Git::SVN out of git-svn and into its own .pm file.
This will make it easier to work with and test. This is just the extraction
with minimal work to keep all tests passing.
A couple of utility functions which were used by Git::SVN, git-svn and others
were also extract
Michael G Schwern wrote:
> And again, it *does not have to be zero sum*. It doesn't have to be email VS
> GUI. You can have your cake and eat it too.
I assume you're talking about web-based interfaces that have gateways
to email, that produce inboxes like this:
24 Jul 02:46 GitHub [github]
On 2012.7.24 7:55 PM, Eric Wong wrote:
>> After I'm exhausted from volunteering all the coding work, rather than
>> submitting a URL to a remote repository I find I have to learn new
>> specialized
>> tools. It's extra learning and work, an extra step to screw up, and foreign
>> to me (even as a
On 2012.7.24 9:53 PM, Jonathan Nieder wrote:
> Michael G Schwern wrote:
>
>> No, now it's just canonicalizing as early as possible. Preferably within the
>> object accessor rather than at the point of use. So in the code below,
>> $full_url is already escaped/canonicalized.
>
> Let's start with
Michael G Schwern wrote:
> No, now it's just canonicalizing as early as possible. Preferably within the
> object accessor rather than at the point of use. So in the code below,
> $full_url is already escaped/canonicalized.
Let's start with this.
Is svn_path_canonicalize() idempotent? What doe
Jiang Xin wrote:
> Found this dead code when I examine gettext messages in shell scripts
> start with dash ('-' or '--'). An error will be raised for this case,
> like:
>
> $ gettext "-d option is no longer supported. Do not use."
> gettext: missing arguments
>
> Indead, this code has be
Jiang Xin wrote:
> Mark strings in 'git-am.sh' for translation. In the last chunk, I
> changed '$1' to '-b/--binary' for this reason:
>
> * First, if there is a variable in the l10n message, we could not use
>gettext. Because the variable will be expanded (evaluated) and will
>never match
(cc-ing Duy because of a mention of his nice GETTEXT_POISON tweak[*])
Hi,
Jiang Xin wrote:
> Mark strings in git-rebase.sh for translation. Jonathan offers a help
> for reorgnization of the resolvemsg variable in 'git-rebase.sh', since
> there is a likely message in git-am.sh, I update it in this
Mark strings in merge-recursive for translation.
Some test scripts are affected by this update, and would fail if tested
with GETTEXT_POISON switch turned on. Using i18n-specific test
functions, such as test_i18ngrep, in the related test scripts will fix
these issues.
Signed-off-by: Jiang Xin
Re
Found this dead code when I examine gettext messages in shell scripts
start with dash ('-' or '--'). An error will be raised for this case,
like:
$ gettext "-d option is no longer supported. Do not use."
gettext: missing arguments
Indead, this code has been left as dead for a long time,
Mark strings in 'git-am.sh' for translation. In the last chunk, I
changed '$1' to '-b/--binary' for this reason:
* First, if there is a variable in the l10n message, we could not use
gettext. Because the variable will be expanded (evaluated) and will
never match the entry in the po file.
The obsolete LONG_USAGE variable has the following message in it:
A'\''--B'\''--C'\''
And such complex LONG_USAGE message will breaks xgettext when extracting
l10n messages. But if single quotes are removed from the message, xgettext
works fine on 'git-rebase.sh'.
Since there is a modern OPT
Gettext message in a shell script should not start with '-', one
workaround is adding '--' between gettext and the message, like:
gettext -- "--exec option ..."
But due to a bug in the xgettext extraction, xgettext can not
extract the actual message for this case. Rewriting the message
is a s
Mark strings in git-rebase.sh for translation. Jonathan offers a help
for reorgnization of the resolvemsg variable in 'git-rebase.sh', since
there is a likely message in git-am.sh, I update it in this commit for
consistency. And so does to 't/t0201-gettext-fallbacks.sh'.
Some test scripts are affe
Since we have additional shell wrappers (gettextln and eval_gettextln)
for gettext, we need to take into account these wrappers when running
'make pot' to extract messages from shell scripts.
Signed-off-by: Jiang Xin
Reviewed-by: Stefano Lattarini
Reviewed-by: Jonathan Nieder
---
Makefile | 3
Marked messages for translation in git-am, git-rebase, and git-merge.
Also fixed affected test cases when turn GETTEXT_POISON switch on.
Jiang Xin (7):
i18n: New keywords for xgettext extraction from sh
i18n: rebase: mark strings for translation
i18n: Rewrite gettext messages start with dash
From: "Michael G. Schwern"
It is no longer necessary to manually add new .pm files to the
Makefile.PL. This makes it easier to add modules.
It is still necessary to add them to the Makefile, but that extra work
should be removed at a future date.
Signed-off-by: Michael G Schwern
---
perl/Mak
From: "Michael G. Schwern"
In older Perls, sometimes $@ can become unset between the eval and
checking $@. Its safer to check the eval directly.
Signed-off-by: Michael G Schwern
---
perl/Makefile.PL | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/perl/Makefile.PL b/perl/
From: "Michael G. Schwern"
Usually it isn't, but its nice if it can be run with warnings on.
Signed-off-by: Michael G Schwern
---
perl/Makefile.PL | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index b54b04a..87e1f62 100644
--- a/perl/
This makes it so you no longer must edit the Makefile.PL every time you
add, rename or delete a Perl module. This is convenient, and I'm about
to extract a bunch of .pm files out of git-svn.
You still have to edit the Makefile. That parallel build system should be
able to be removed at a later da
Symlinks are not ubiquitous on Windows so make --no-symlinks the default.
Signed-off-by: David Aguilar
---
I don't have cygwin so I can't verify this one myself.
Is 'cygwin' really the value of $^O there?
git-difftool.perl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gi
Handle the case where compare() is unable to read its inputs.
Emit a warning so that the user knows that something went wrong.
We may later want to restructure the code so that we can inhibit
tempdir cleanup when this condition is reached.
Signed-off-by: David Aguilar
---
git-difftool.perl | 11
Use the original File::Find implementation from
bf73fc212a159210398b6d46ed5e9101c650e7db
so that we properly handle mergetools/ being located in a path containing
spaces.
One small difference is that we avoid using a global variable by
passing a reference to the list of tools.
Signed-off-by: Dav
These are incremental updates on top of da/difftool-updates,
which is currently in next.
David Aguilar (3):
difftool: Handle finding mergetools/ in a path with spaces
difftool: Check all return codes from compare()
difftool: Disable --symlinks on cygwin
git-difftool.perl | 41 +
On Tue, Jul 24, 2012 at 7:40 PM, Junio C Hamano wrote:
> David Aguilar writes:
>
Does this implementation handle that case? I'm sorry, but I haven't
had time to apply and test myself.
[1]:
http://thread.gmane.org/gmane.comp.version-control.git/193233/focus=193925
[
Teach difftool's --dir-diff mode to use symlinks to represent
files from the working copy, and make it the default behavior
for the non-Windows platforms.
Using symlinks is safer since we avoid needing to copy temporary
files into the worktree.
The original behavior is available as --no-symlinks.
The "diffall" name was left over from when this functionality was part of
the "git-diffall" script in contrib/. Make the naming consistent.
Signed-off-by: David Aguilar
---
Same as last time, rebased
git-difftool.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-diff
Shorten the "my" declaration for all of the option-specific variables
by wrapping all of them in a hash. This also gives us a place to
specify default values, should we need them.
Signed-off-by: David Aguilar
---
Same as last time, rebased
git-difftool.perl | 55 +++
Organize the script so that it has a single main() function which
calls out to dir_diff() and file_diff() functions. This eliminates
"dir-diff"-specific variables that do not need to be calculated when
performing a regular file-diff.
Signed-off-by: David Aguilar
---
Same as last time, but rebased
Replace a global variable with a closure.
Signed-off-by: David Aguilar
---
Differences from last time:
This keeps the original File::Find implementation and wraps the
global variable in a closure as the first step in the
globals-elimination cleanup.
git-difftool.perl | 8
1 file chang
Teach difftool to use symlinks when diffing against the worktree.
David Aguilar (5):
difftool: print_tool_help() globals
difftool: Eliminate global variables
difftool: Move option values into a hash
difftool: Call the temp directory "git-difftool"
difftool: Use symlinks when diffing agai
Michael G Schwern wrote:
> On 2012.7.17 10:49 PM, Junio C Hamano wrote:
> > By allowing people to easily publish a completed work, and making it
> > easier for them to let others peek at their work, Git hosting
> > services like GitHub are wonderful. But I am not conviced that
> > quality code re
David Aguilar writes:
>>> Does this implementation handle that case? I'm sorry, but I haven't
>>> had time to apply and test myself.
>>>
>>> [1]:
>>> http://thread.gmane.org/gmane.comp.version-control.git/193233/focus=193925
>>> [2]: http://thread.gmane.org/gmane.comp.version-control.git/194158
On Tue, Jul 24, 2012 at 6:52 PM, David Aguilar wrote:
> On Tue, Jul 24, 2012 at 5:43 AM, Tim Henigan wrote:
>> On Sun, Jul 22, 2012 at 11:42 PM, David Aguilar wrote:
>>> Eliminate a global variable and File::Find usage by building upon
>>> basename() and glob() instead.
>>
>> glob was used in an
On Tue, Jul 24, 2012 at 5:43 AM, Tim Henigan wrote:
> On Sun, Jul 22, 2012 at 11:42 PM, David Aguilar wrote:
>> Eliminate a global variable and File::Find usage by building upon
>> basename() and glob() instead.
>
> glob was used in an early revision of the patch that led to bf73fc2
> (difftool:
On 2012.7.24 4:45 PM, Junio C Hamano wrote:
>>> git log -p schwern/git-svn/extract-classes..schwern/git-svn/fix-canonical
>>>
>>> That should give you the information you need...
>>
>> I guess so. May we have your sign-off on these changes? (A simple
>> reply of "yes" is enough, no need to rese
Jonathan Nieder writes:
> Michael G Schwern wrote:
>
>> git log -p schwern/git-svn/extract-classes..schwern/git-svn/fix-canonical
>>
>> That should give you the information you need...
>
> I guess so. May we have your sign-off on these changes? (A simple
> reply of "yes" is enough, no need to
Michael G Schwern wrote:
> git log -p schwern/git-svn/extract-classes..schwern/git-svn/fix-canonical
>
> That should give you the information you need...
I guess so. May we have your sign-off on these changes? (A simple
reply of "yes" is enough, no need to resend patches to do this.)
Here it
Hi,
Michael G Schwern wrote:
> But since you brought Github up... (I get the impression its kind of a dirty
> word around here)
On the contrary, one of the main contributors is employed by github,
github hosts the git website, and all in all, github has done great
work.
Many people on the git l
Michael G Schwern wrote:
> While I use git heavily I'm not invested in working on it. I work on a lot of
> projects. I'd like to be able to do the work, submit it, work through review,
> and get out without joining another mailing list and studying their culture.
An alternative approach would b
On 2012.7.24 2:51 PM, Junio C Hamano wrote:
> Michael G Schwern writes:
>
>> A big one is "do not blast 10 emails to a mailing list" but I gather that's
>> ok
>> here if a submission needs 10 commits to be well expressed and its done via
>> git-send-email? And then if patch #3 needs revision I'
Hi again,
Michael G Schwern wrote:
> On 2012.7.24 3:02 PM, Jonathan Nieder wrote:
>> Could you send the first five patches that *are* supposed to have a
>> functional effect? I know that they will not apply cleanly to git-svn
>> from git "master" or on top of each other; that's fine with me. If
2012/7/25 Jonathan Nieder :
>> -b|--binary)
>> - echo >&2 "The $1 option has been a no-op for long time, and"
>> - echo >&2 "it will be removed. Please do not use it anymore."
>> + echo >&2 $(gettext "The -b option has been a no-op for long
>> time, and
>>
On 2012.7.24 3:02 PM, Jonathan Nieder wrote:
>> The Git::SVN extraction is more complicated than the rest, so I'll probably
>> do
>> that separately and bust it up into a few commits.
>
> All of these changes are supposed to have zero functional effect,
> right?
Right. They're just class extrac
2012/7/25 Jonathan Nieder :
>> @@ -64,7 +64,7 @@ test_expect_success 'rebase -n overrides config
>> rebase.stat config' '
>>
>> test_expect_success 'rebase --onto outputs the invalid ref' '
>> test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
>> - grep "invalid-ref" err
>>
On 2012.7.17 10:49 PM, Junio C Hamano wrote:
> By allowing people to easily publish a completed work, and making it
> easier for them to let others peek at their work, Git hosting
> services like GitHub are wonderful. But I am not conviced that
> quality code reviews like we do on the mailing list
Jonathan Nieder writes:
> I guess that means the intended justification is the following?
>
> The git am -d/--dotest option has errored out with a message
> since e72c7406 (am: remove support for -d .dotest, 2008-03-04).
> The error message about lack of support was eliminated a
2012/7/24 Junio C Hamano :
> I wonder if running test in a real directory (in other words, "fix"
> your cwd) may be a simpler, more robust and generally a better
> solution, e.g. something silly like...
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index acda33d..7f6fb0a 100644
> --- a/t/test-li
Hi,
Michael G Schwern wrote:
> I'm trying to bust it up into easier to digest pieces.
I have a crazy idea. You might not like it, but maybe it's worth giving
it a try.
[...]
> The Git::SVN extraction is more complicated than the rest, so I'll probably do
> that separately and bust it up into a
Michael G Schwern writes:
> A big one is "do not blast 10 emails to a mailing list" but I gather that's ok
> here if a submission needs 10 commits to be well expressed and its done via
> git-send-email? And then if patch #3 needs revision I'm to do it in a rebase
> and resend the whole 10 commit
It's post OSCON so I can take another crack at this again.
I'm struggling with how best to present all this to you folks. There's
etiquette for how one presents a git pull request... but there's conflicting
etiquette about how one presents patches to a mailing list. I'm not sure
which bit of whi
Martin von Zweigbergk wrote:
> On Tue, Jul 24, 2012 at 11:27 AM, Jonathan Nieder wrote:
>> Jiang Xin wrote:
>>> Gettext message should not start with '-' nor '--'. Since the '-d' and
>>> '--dotest' options do not exist in OPTIONS_SPEC variable, it's safe to
>>> remove the block.
>>
>> The above j
Martin von Zweigbergk writes:
> On Tue, Jul 24, 2012 at 11:27 AM, Jonathan Nieder wrote:
>> Hi,
>>
>> Jiang Xin wrote:
>>
>>> Gettext message should not start with '-' nor '--'. Since the '-d' and
>>> '--dotest' options do not exist in OPTIONS_SPEC variable, it's safe to
>>> remove the block.
>>
On Tue, Jul 24, 2012 at 11:27 AM, Jonathan Nieder wrote:
> Hi,
>
> Jiang Xin wrote:
>
>> Gettext message should not start with '-' nor '--'. Since the '-d' and
>> '--dotest' options do not exist in OPTIONS_SPEC variable, it's safe to
>> remove the block.
>
> The above justification is not a suffic
Jonathan Nieder writes:
>> -b|--binary)
>> -echo >&2 "The $1 option has been a no-op for long time, and"
>> -echo >&2 "it will be removed. Please do not use it anymore."
>> +echo >&2 $(gettext "The -b option has been a no-op for long
>> time, and
>> +it w
Jonathan Nieder writes:
>> --d|--dotest)
>> -die "$(gettext "-d option is no longer supported. Do not
>> use.")"
>> -;;
>
> Luckily the support was removed 4 years ago and I don't think anyone
> is going to run into this, so a different justification could apply.
St
Justin Spahr-Summers writes:
> On Tuesday, 24. July 2012 at 13:26, Junio C Hamano wrote:
> ...
>> I can see one codepath that would behave incorrectly,...
>> ...
>> My recommendation at this point (i.e. not a long term) for people
>> with problems Justin saw is "Don't do it then".
>
> I appreciat
On Tuesday, 24. July 2012 at 13:26, Junio C Hamano wrote:
> Jens Lehmann http://web.de)> writes:
>
> > Am 24.07.2012 21:01, schrieb Justin Spahr-Summers:
> > > This occurs on Mac OS X 10.7.4, on git versions 1.7.10.2 (Apple Git-33)
> > > and 1.7.11.3.
> > >
> > > Steps:
> > > 1. Create or clone
On Tuesday, 24. July 2012 at 13:08, Jens Lehmann wrote:
> Am 24.07.2012 21:01, schrieb Justin Spahr-Summers:
> > This occurs on Mac OS X 10.7.4, on git versions 1.7.10.2 (Apple Git-33) and
> > 1.7.11.3.
> >
> > Steps:
> > 1. Create or clone a repository to an absolute path that contains spaces.
Jens Lehmann writes:
> Am 24.07.2012 21:01, schrieb Justin Spahr-Summers:
>> This occurs on Mac OS X 10.7.4, on git versions 1.7.10.2 (Apple Git-33) and
>> 1.7.11.3.
>>
>> Steps:
>> 1. Create or clone a repository to an absolute path that contains spaces.
>> 2. Add a submodule to the reposito
Am 24.07.2012 21:01, schrieb Justin Spahr-Summers:
> This occurs on Mac OS X 10.7.4, on git versions 1.7.10.2 (Apple Git-33) and
> 1.7.11.3.
>
> Steps:
> 1. Create or clone a repository to an absolute path that contains spaces.
> 2. Add a submodule to the repository, if it does not already have
Ramsay Jones writes:
> The only problematic platforms I test on are "NTFS/bash" on cygwin and MinGW.
> Since commit 2b843732 ("Suppress some bash redirection error messages",
> 26-08-2008), I have not noticed any complaints regarding this problem.
> What have I missed?
>
> Assuming we are not tal
Hi,
Junio C Hamano wrote:
> Florian Achleitner writes:
>> To ease testing without depending on a reachable svn server, this
>> compact python script mimics parts of svnrdumps behaviour.
>> It requires the remote url to start with sim://.
[...]
>> To allow using the same dump file for simulating
Hi,
In June, Dmitry Ivankov wrote:
> In presence of "from $some" command "merge $itself" acts the same as
> "merge $some" would. Which is completely undocumented and looks like
> a bug (caused by parse_from() temporarily rewriting b->sha1 with $some).
Could you give an example?
> Just deny "mer
Hi,
In June, Dmitry Ivankov wrote:
> null_sha1 is used in fast-import to indicate "empty" branches and
> should never be actually written out as a commit parent. 'merge'
> command lacks is_null_sha1 checks and must be fixed.
>
> It looks like using null_sha1 or empty branches in 'from' command
>
Chris Webb writes:
> There is a bug with git rebase -i --root when a fixup or squash line is
> applied to the new root. We attempt to amend the commit onto which they
> apply with git reset --soft HEAD^ followed by a normal commit. Unlike a
> real commit --amend, this sequence will fail against a
Hi,
Ramsay Jones wrote:
> The only problematic platforms I test on are "NTFS/bash" on cygwin and MinGW.
> Since commit 2b843732 ("Suppress some bash redirection error messages",
> 26-08-2008), I have not noticed any complaints regarding this problem.
Yeah, that probably took care of squashing th
At present, running the t3300-*.sh test on cygwin looks like:
$ cd t
$ ./t3300-funny-names.sh
ok 1 - setup
# passed all 1 test(s)
1..1 # SKIP Your filesystem does not allow tabs in filenames
$
Unfortunately, this is not valid TAP output, which prove notes
as follows:
Jonathan Nieder wrote:
>> Needless to say, I much prefer the patch below. :-D
>
> Thanks for a nice explanation. In general I definitely like getting
> rid of these setup tests when possible. Let's see:
>
> [...]
>> --- a/t/t3300-funny-names.sh
>> +++ b/t/t3300-funny-names.sh
>> @@ -15,28 +15,2
Hi,
Ramsay Jones wrote:
> Hi Jonathan,
>
> This version of the patch only moves code to determine the test
> prerequisite to the outer level, while leaving the 'setup' aspects
> of the first test in place.
I guess I don't see the point. The current convention of "don't do
anything complicated o
Jonathan Nieder writes:
> Jiang Xin wrote:
>
>> The obsolete LONG_USAGE variable
> [...]
>
> It's a shame to lose the information that was in the LONG_USAGE
> message, though. Maybe it could be incorporated into the OPTIONS_SPEC
> before the opening "--", or maybe it could be used to clarify the
Jonathan Nieder writes:
> Probably it would make sense to do
>
> resolvemsg="
> $(gettext 'When you have resolved this problem, run "git rebase
> --continue".
> If you prefer to skip this patch, run "git rebase --skip" instead.
> To check out the original branch and stop
Hi,
Jiang Xin wrote:
> Gettext message should not start with '-' nor '--'. Since the '-d' and
> '--dotest' options do not exist in OPTIONS_SPEC variable, it's safe to
> remove the block.
The above justification is not a sufficient reason to stop giving
helpful advice when someone uses an option
Hi,
Jiang Xin wrote:
> Mark additional 3 strings for translation, and reduce one indentation
> level for one gettextln clause introduced in commit de88c1c.
The above description doesn't mention:
[...]
> @@ -387,8 +386,8 @@ do
> -i|--interactive)
> interactive=t ;;
> -b
Hi,
Jiang Xin wrote:
> Mark strings in git-rebase.sh for translation.
Thanks.
[...]
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -65,6 +65,7 @@ abort! abort and check out the original branch
> skip! skip current patch and continue
> "
> . git-sh-setup
> +. git-sh
Hi,
Jiang Xin wrote:
> The obsolete LONG_USAGE variable
[...]
It's a shame to lose the information that was in the LONG_USAGE
message, though. Maybe it could be incorporated into the OPTIONS_SPEC
before the opening "--", or maybe it could be used to clarify the
description in git-rebase(1).
Cc
Jiang Xin wrote:
> Since we have additional shell wrappers (gettextln and eval_gettextln)
> for gettext, we need to take into account these wrappers when run
> 'make pot' to extract messages from shell scripts.
Yes, thanks for fixing it.
As Stefano mentioned, s/run/running/ would make the above
Thomas Rast writes:
> Junio's index-v4 was a speed boost mainly because it cuts down on the
> size of the index. Do we want to throw that out?
That's pretty much orthogonal, isn't it?
The index-v4 is merely to show how a stupid prefix compression of
pathnames without nothing else would reduce
On Mon, Jul 23, 2012 at 2:17 PM, John Bartholomew
wrote:
>
> I find the output of `git branch' to be quite bare, and would like to
> see more information; most importantly, what the state of the branch
> is in relation to its upstream. For some time I have been using my
> own script to do this. It
Tim Henigan writes:
> I'm sorry I am so late to see and comment on this...I am just getting
> caught up after a few busy weeks due to $dayjob and vacation.
>
>
> On Mon, Jul 23, 2012 at 2:05 AM, David Aguilar wrote:
>>
>> diff --git a/git-difftool.perl b/git-difftool.perl
>> index 2ae344c..a5b37
Jiang Xin writes:
> Run command 'git rev-parse --git-dir' under subdir will return realpath
> of '.git' directory. Some test scripts compare this realpath against
> "$TRASH_DIRECTORY", they are not equal if current working directory is
> on a symlink.
>
> In this fix, get realpath of "$TRASH_DIRE
Jeff King writes:
> On Mon, Jul 23, 2012 at 10:10:00PM -0700, Junio C Hamano wrote:
>
>> * jc/test-lib-source-build-options-early (2012-06-24) 1 commit
>> - test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
>>
>> Reorders t/test-lib.sh so that we dot-source GIT-BUILD-OPTIONS that
>>
On Mon, Jul 23, 2012 at 10:10:00PM -0700, Junio C Hamano wrote:
> * jc/test-lib-source-build-options-early (2012-06-24) 1 commit
> - test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
>
> Reorders t/test-lib.sh so that we dot-source GIT-BUILD-OPTIONS that
> records the shell and Perl
Running the http tests with valgrind does not work for two
reasons:
1. Apache complains about following the symbolic link from
git-http-backend to valgrind.sh.
2. Apache does not pass through the GIT_VALGRIND variable
to the backend CGI.
This patch fixes both problems. Unfortunatel
I'm sorry I am so late to see and comment on this...I am just getting
caught up after a few busy weeks due to $dayjob and vacation.
On Mon, Jul 23, 2012 at 2:05 AM, David Aguilar wrote:
>
> diff --git a/git-difftool.perl b/git-difftool.perl
> index 2ae344c..a5b371f 100755
> --- a/git-difftool.pe
On Tue, Jul 24, 2012 at 02:26:51PM +0200, Matthieu Moy wrote:
> Commit e3ebc35 (config: fix several access(NULL) calls, 2012-07-12) was
> fixing access(NULL) calls when trying to access $HOME/.config/git/config,
> but missed the ones when trying to access $HOME/.config/git/ignore. Fix
> and test t
On Sun, Jul 22, 2012 at 11:42 PM, David Aguilar wrote:
> Eliminate a global variable and File::Find usage by building upon
> basename() and glob() instead.
glob was used in an early revision of the patch that led to bf73fc2
(difftool: print list of valid tools with '--tool-help') as well [1].
How
Commit e3ebc35 (config: fix several access(NULL) calls, 2012-07-12) was
fixing access(NULL) calls when trying to access $HOME/.config/git/config,
but missed the ones when trying to access $HOME/.config/git/ignore. Fix
and test this.
Signed-off-by: Matthieu Moy
---
This can be appended to Jeff's s
On Tue, Jul 24, 2012 at 02:06:43PM +0200, Matthieu Moy wrote:
> Thanks (for the 3 patches, all of them look good).
>
> the "unset XDG_CONFIG_HOME" part was already discussed here:
>
> http://thread.gmane.org/gmane.comp.version-control.git/201609
>
> But Michael did not continue the thread. I
There is a bug with git rebase -i --root when a fixup or squash line is
applied to the new root. We attempt to amend the commit onto which they
apply with git reset --soft HEAD^ followed by a normal commit. Unlike a
real commit --amend, this sequence will fail against a root commit as it
has no par
Thanks (for the 3 patches, all of them look good).
the "unset XDG_CONFIG_HOME" part was already discussed here:
http://thread.gmane.org/gmane.comp.version-control.git/201609
But Michael did not continue the thread. I think your solution (unset
$XDG_CONFIG_HOME instead of setting it to $HOME/.c
On Mon, Jul 23, 2012 at 2:44 PM, Florian Achleitner
wrote:
> + sys.exit(ret)
> \ No newline at end of file
Nit: add a \n after "sys.exit(ret)", perhaps?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo inf
1 - 100 of 121 matches
Mail list logo
