On Sat, Jul 13, 2013 at 2:29 AM, Stefan Beller
wrote:
> On 07/13/2013 02:35 AM, Eric Sunshine wrote:
>> Two tests in t4203-mailmap.sh set up the mapping =>
>> in an apparent attempt to check that email address
>> remapping works as expected (in addition to name remapping which is also
>> tested)
On 07/15/2013 08:10 AM, Jonathan Nieder wrote:
> Stefan Beller wrote:
>
>> Signed-off-by: Stefan Beller
>
> Markup and methodology look correct.
>
> Fwiw,
> Reviewed-by: Jonathan Nieder
>
> Is this meant to be squashed with 94b410bb (.mailmap: Map email
> addresses to names, 2013-07-12)?
>
>
On 07/15/2013 08:02 AM, Jonathan Nieder wrote:
> Michael Haggerty wrote:
>
>> Add a notice to the top of post-receive-email explaining that the
>> script is no longer under active development and pointing the user to
>> git-multimail.
>
> I think the spirit of this patch is sane. Some thoughts o
Jonathan Nieder writes:
> (3)
> # An example hook ...
> #
> # Warning: this script is no longer actively maintained. Consider
> # switching to ...
>
> I prefer (2), which makes it clear to the reader that it is dangerous
> to keep using the script (since no one is activel
Junio C Hamano writes:
> * bp/mediawiki-preview (2013-07-08) 7 commits
> (merged to 'next' on 2013-07-12 at 870890a)
> + git-remote-mediawiki: add preview subcommand into git mw
> + git-remote-mediawiki: add git-mw command
> + git-remote-mediawiki: factoring code between git-remote-mediawiki
Michael Haggerty writes:
> I've alluded to this little project of mine on the mailing list before,
> but I've never really announced it properly. So here we go...
>
> git-imerge [1] is an open-source tool that helps you perform difficult
> Git merges and rebases by allowing conflicts to be resol
Jonathan Nieder wrote:
>
> Sounds sensible. Can we have your sign-off? (Likewise for the next
> patch.)
Doh! Thanks for looking at the patches. I'll post revised versions, plus a
couple more tweaks.
Tony.
--
f.anthony.n.finchhttp://dotat.at/
Forties, Cromarty: East, veering southeast, 4 o
Signed-off-by: Tony Finch
---
gitweb/static/gitweb.css | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gitweb/static/gitweb.css b/gitweb/static/gitweb.css
index a869be1..3b4d833 100644
--- a/gitweb/static/gitweb.css
+++ b/gitweb/static/gitweb.css
@@ -68,12 +68,13 @@ div.page
The search help link was a superscript question mark right next to
a drop-down menu, which looks misaligned and is a cramped and
awkward click target. Remove the superscript tags and add some
spacing to fix these nits. Add a title attribute to provide an
explanatory mouseover.
Signed-off-by: Tony
On the repository summary page, leave the whole owner line out if
the repo does not have an owner, rather than displaying a labelled
empty field..
Signed-off-by: Tony Finch
---
gitweb/gitweb.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitw
The rss_logo CSS style has a fixed width which is too narrow for
the string "OPML". Replace the fixed width with horizontal padding
so the text fits with nice margins.
Signed-off-by: Tony Finch
---
gitweb/static/gitweb.css | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/git
Duy Nguyen writes:
> On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer
> wrote:
>> t/perf/p0003-index.sh| 59 +
>> t/t2104-update-index-skip-worktree.sh|1 +
>
> For such a big code addition, the test part seems modest. Speaking
> from my experience
On Mon, Jul 15, 2013 at 4:30 PM, Thomas Gummerer wrote:
> Duy Nguyen writes:
>
>> On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer
>> wrote:
>>> t/perf/p0003-index.sh| 59 +
>>> t/t2104-update-index-skip-worktree.sh|1 +
>>
>> For such a big code a
(I'm attempting to combine the various separate email replies into a
single response here, please forgive me if I mangle something up.)
On Jul 14, 2013, at 22:12, Jeff King wrote:
On Sun, Jul 14, 2013 at 09:02:19PM -0700, Junio C Hamano wrote:
Or proceed with what's there right now (there
Duy Nguyen writes:
> On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer
> wrote:
>> +static int grep_cache(struct cache_entry *ce, void *cb_data)
>> {
>> - int hit = 0;
>> - int nr;
>> - read_cache();
>> + struct grep_opts *opts = cb_data;
>>
>> - for (nr = 0; nr <
This patch series adds support for url-specific http.* settings.
It has been suggested that a preparatory patch to address the way the
http.sslCertPasswordProtected variable is handled be included.
I'm not sure if the intent was to make that a separate patch or include it
in a patch series togeth
From: Junio C Hamano
The existing code triggers only when the configuration variable is
set to true. Once the variable is set to true in a more generic
configuration file (e.g. ~/.gitconfig), it cannot be overriden to
false in the repository specific one (e.g. .git/config).
Signed-off-by: Junio
The existing code triggers whenever GIT_SSL_CERT_PASSWORD_PROTECTED
is defined. Setting GIT_SSL_CERT_PASSWORD_PROTECTED to a false
value could not be used to override the http.sslCertPasswordProtected
setting once it had been turned on.
Signed-off-by: Kyle J. McKay
---
http.c | 7 +++
1 fil
The credentials configuration values already support url-specific
configuration items in the form credential..*. This patch
adds similar support for http configuration values.
The value is considered a match to a url if the value
is either an exact match or a prefix of the url which ends on a
p
Improve on the http..* url matching behavior by first
normalizing the urls before they are compared.
With this change, for example, the following configuration
section:
[http "https://example.com/path";]
useragent = example-agent
sslVerify = false
will properly match a "HTTPS://e
In order to perform sane URL matching for http..* options,
http.c normalizes URLs before performing matches.
A new test-url-normalize test program is introduced along with
a new t5200-url-normalize.sh script to run the tests.
Since the url_normalize function currently lives in http.c this
test wi
A little bit more..
On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer wrote:
> +static void ce_queue_push(struct cache_entry **head,
> +struct cache_entry **tail,
> +struct cache_entry *ce)
> +{
> + if (!*head) {
> + *hea
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Hello,
so I wanted to write a script using some git commands,
but the output of the git commands is not as expected.
I am using
git --version
git version 1.8.3.2.804.g0da7a53
(current origin/master at git://github.com/gitster/git.git)
The command I
Stefan Beller writes:
> However I sometimes also get:
> sb@sb:~/OSS/git$ git show --format="%ad" 0da7a53
> Fri Jul 12 10:49:34 2013 -0700
>
> diff --git a/Documentation/RelNotes/1.8.4.txt
> b/Documentation/RelNotes/1.8.4.txt
> index 0e50df8..4250e5a 100644
> --- a/Documentation/RelNotes/1.8.4.txt
On 07/15/2013 02:12 PM, Matthieu Moy wrote:
> Stefan Beller writes:
>
>> However I sometimes also get:
>> sb@sb:~/OSS/git$ git show --format="%ad" 0da7a53
>> Fri Jul 12 10:49:34 2013 -0700
>>
>> diff --git a/Documentation/RelNotes/1.8.4.txt
>> b/Documentation/RelNotes/1.8.4.txt
>> index 0e50df8..
I noticed that "quiet" and "agent" capabilities were missing in
protocol-capabilitities.txt. I have a rough idea what they do, but I
think it's best to be documented by the authors. Maybe you have some
time to make a patch?
--
Duy
--
To unsubscribe from this list: send the line "unsubscribe git" in
On 07/13/2013 03:27 PM, Mantas Mikulėnas wrote:
> I have a clone of linux.git with various stuff added to it (remotes for
> 'stable' and 'next', a bunch of local tags, and historical repositories
> imported using `git replace`).
>
> Yesterday, I noticed that `git describe`, built from git.git mast
Signed-off-by: Matthieu Moy
---
Documentation/git-show.txt | 9 +
1 file changed, 9 insertions(+)
diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index ae4edcc..4e617e6 100644
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -45,6 +45,15 @@ includ
This follows the usual convention of having a --no-foo option to negate
--foo.
Signed-off-by: Matthieu Moy
---
Documentation/rev-list-options.txt | 1 +
diff.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/rev-list-options.txt
b/
Signed-off-by: Matthieu Moy
---
diff.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 6bd821d..66a6877 100644
--- a/diff.c
+++ b/diff.c
@@ -3515,9 +3515,10 @@ int diff_opt_parse(struct diff_options *options, const
char **av, int ac)
int arg
This is the convention in other files and even at the beginning of git-log.txt
Signed-off-by: Matthieu Moy
---
Documentation/git-log.txt | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 2ea79ba..2eda5e4 100644
> Stefan Beller writes:
>
>> However I sometimes also get:
>> sb@sb:~/OSS/git$ git show --format="%ad" 0da7a53
>> Fri Jul 12 10:49:34 2013 -0700
>>
>> diff --git a/Documentation/RelNotes/1.8.4.txt
>> b/Documentation/RelNotes/1.8.4.txt
>> index 0e50df8..4250e5a 100644
>> --- a/Documentation/RelNote
Technically, "-s, --no-patch" is implemented in diff.c ("git diff
--no-patch" is essentially useless, but valid). From the user point of
view, this allows the documentation to show up in "git show --help",
which is one of the most useful use of the option.
While we're there, add a sentence explain
On Mon, Jul 15, 2013 at 4:03 PM, Michael Haggerty wrote:
> On 07/13/2013 03:27 PM, Mantas Mikulėnas wrote:
>> I have a clone of linux.git with various stuff added to it (remotes for
>> 'stable' and 'next', a bunch of local tags, and historical repositories
>> imported using `git replace`).
>>
>> Y
Matthieu Moy writes:
> Jonathan Nieder writes:
>
>> (3)
>> # An example hook ...
>> #
>> # Warning: this script is no longer actively maintained. Consider
>> # switching to ...
>>
>> I prefer (2), which makes it clear to the reader that it is dangerous
>> to keep using the s
Cygwin's regex library does not pass git's tests, so don't use it. This
fixes failures in t4018 and t4034.
Signed-off-by: Mark Levedahl
---
config.mak.uname | 1 +
1 file changed, 1 insertion(+)
diff --git a/config.mak.uname b/config.mak.uname
index 7ac541e..6901597 100644
--- a/config.mak.unam
Stefan Beller writes:
> The date variable is assigned new memory via xmemdupz and 2 lines later
> it is assigned new memory again via xmalloc, but the first assignment
> is never freed nor used.
> ---
> builtin/commit.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/builtin/commit.c b/b
On 07/15/2013 04:42 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> The date variable is assigned new memory via xmemdupz and 2 lines later
>> it is assigned new memory again via xmalloc, but the first assignment
>> is never freed nor used.
>> ---
>> builtin/commit.c | 1 -
>> 1 file chan
Matthieu Moy writes:
> Signed-off-by: Matthieu Moy
> ---
> Documentation/git-show.txt | 9 +
> 1 file changed, 9 insertions(+)
>
> diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
> index ae4edcc..4e617e6 100644
> --- a/Documentation/git-show.txt
> +++ b/Documentatio
Matthieu Moy writes:
> Signed-off-by: Matthieu Moy
> ---
> diff.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/diff.c b/diff.c
> index 6bd821d..66a6877 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -3515,9 +3515,10 @@ int diff_opt_parse(struct diff_options *options,
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> Signed-off-by: Matthieu Moy
>> ---
>> Documentation/git-show.txt | 9 +
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
>> index ae4edcc..4e617e6 100644
>> --- a/Documentati
Eric Sunshine writes:
> Resolve segmentation fault due to arguments passed in wrong order.
>
> Signed-off-by: Eric Sunshine
Thanks. Shows that the debugging support hasn't been in use for
quite a long time X-<.
> ---
> mailmap.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> dif
Thanks, the whole series looks sensible. Will replace and queue.
--
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
If do_one_ref() is called recursively, then the inner call should not
permanently overwrite the value stored in current_ref by the outer
call. Aside from the tiny optimization loss, peel_ref() expects the
value of current_ref not to change across a call to peel_entry(). But
in the presence of rep
Junio C Hamano writes:
> I am wondering if the difference after this patch between "-p" and
> "-U8" is deliberate, or just an accident coming from the way the
> original was written in ee1e5412 (git diff: support "-U" and
> "--unified" options properly, 2006-05-13).
No, it isn't. I just didn't n
Duy Nguyen writes:
> On Mon, Jul 15, 2013 at 8:01 AM, Duy Nguyen wrote:
>>> Also, the sender may have cloned from the receiver (fully) and then
>>> fetched a different history shallowly from elsewhere. The receiver
>>> may have no commit on that history, including the shallow-bottom.
>>>
>>
>>
This reverts commit dacd2bcc414e0b7aac36aaa400da0a743c4741cc.
"It fails reliably without corrupting the receiving repository when
it should fail" may be better than the situation before the receiving
end was hardened recently, but the fact that sometimes the push does
not go through still remains.
Jonathan Nieder writes:
> Now suppose my relay has some downtime. That's fine --- I can still
> maintain the mirror by running the same commands on another machine.
> But when the old relay comes back up, "push --lockref" will fail and
> "pu" and "next" in my mirror are not updated any more.
>
>
> I think the use of "reverse tracking" is way overrated. It is
> probably the only default value that we could use, if the user is
> too lazy not to specify it, but I do not think it is particularly a
> sensible or safe default.
>
> The following does not discuss "should --lockref automatically
"Kyle J. McKay" writes:
> That works fine for GIT_SSL_CERT_PASSWORD_PROTECTED and
> GIT_CURL_VERBOSE, but it's a little bit awkward for GIT_SSL_NO_VERIFY
> and GIT_CURL_FTP_NO_EPSV since they have "_NO_" in their names.
>
> If the user wants to override a "http.sslVerify=false" then
> "GIT_SSL_NO
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
Doug Bell writes:
> diff --git a/builtin/show-ref.c b/builtin/show-ref.c
> index 4a0310d..4b069e7 100644
> --- a/builtin/show-ref.c
> +++ b/builtin/show-ref.c
> @@ -31,6 +31,9 @@ static int show_ref(const char *refname, const unsigned
> char *sha1, int flag, vo
> const char *hex;
> u
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> I am wondering if the difference after this patch between "-p" and
>> "-U8" is deliberate, or just an accident coming from the way the
>> original was written in ee1e5412 (git diff: support "-U" and
>> "--unified" options properly, 2006-05-13).
Richard Hartmann writes:
> On Sun, Jul 14, 2013 at 9:20 PM, Junio C Hamano wrote:
>
>> Shells on modern distros and platforms have "echo" built-in, so this
>> patch replaces series of writes internal to the shell with a fork to
>> cat with heredoc (which often is implemented with a temporary fil
Richard Hartmann writes:
> Verbatim copy of 4b8234b2693af634a77ea059331d1658e070f6d7 in original
> patch series from 2013-06-10.
As Jonathan said, this is not a commit log message.
I've applied up to 3/6 with fixups, but will stop here for now.
>
> Signed-off-by: Richard Hartmann
> ---
> Doc
Keep the sketch aligned independent of the tabstop width used.
Signed-off-by: Dirk Wallenstein
---
Documentation/howto/revert-a-faulty-merge.txt | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Documentation/howto/revert-a-faulty-merge.txt
b/Documentation/how
This fixes the issue found by Junio where "git log --no-patch -u" was
showing the patch, but not "git log --no-patch -U8". Other patches are
unmodified.
Matthieu Moy (5):
diff: allow --no-patch as synonym for -s
diff: allow --patch & cie to override -s/--no-patch
Documentation/git-show.txt:
Technically, "-s, --no-patch" is implemented in diff.c ("git diff
--no-patch" is essentially useless, but valid). From the user point of
view, this allows the documentation to show up in "git show --help",
which is one of the most useful use of the option.
While we're there, add a sentence explain
Signed-off-by: Matthieu Moy
---
Documentation/git-show.txt | 9 +
1 file changed, 9 insertions(+)
diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index ae4edcc..4e617e6 100644
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -45,6 +45,15 @@ includ
This is the convention in other files and even at the beginning of git-log.txt
Signed-off-by: Matthieu Moy
---
Documentation/git-log.txt | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 2ea79ba..2eda5e4 100644
This follows the usual convention of having a --no-foo option to negate
--foo.
Signed-off-by: Matthieu Moy
---
Documentation/rev-list-options.txt | 1 +
diff.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/rev-list-options.txt
b/
All options that trigger a patch output now override --no-patch.
The case of --binary is particular as the name may suggest that it turns
a normal patch into a binary patch, but it actually already enables patch
output when normally disabled (e.g. "git log --binary" displays a patch),
hence it mak
Matthieu Moy wrote:
> --- a/diff.c
> +++ b/diff.c
> @@ -3551,7 +3551,7 @@ int diff_opt_parse(struct diff_options *options, const
> char **av, int ac)
> options->output_format |= DIFF_FORMAT_NAME;
> else if (!strcmp(arg, "--name-status"))
> options->output_format
Clearly there is the possibility of creating a corrupt repository when
receiving objects and updating refs, if a crash or power failure causes
data not to get written to disk but that data is pointed to. Journaling
mitigates this, but I'd argue that programs should function safely with
only the g
Greg Troxel wrote:
> Alternatively, is there somewhere a first-principles analysis vs POSIX
> specs (such as fsyncing object files before updating refs to point to
> them, which I realize has performance negatives)?
You might be interested in the 'core.fsyncobjectfiles' setting.
git-config(1) has
Junio C Hamano wrote:
[ ... ]
> * rr/send-email-ssl-verify (2013-07-06) 6 commits
> - SQUASH??? update to support SSL_ca_file as well as SSL_ca_path
> - SQUASH??? send-email: cover both smtps and starttls cases
> - fixup! send-email: squelch warning from Net::SMTP::SSL
> - SQUASH??? send-email
Sparse issues three "Using plain integer as NULL pointer" warnings.
Each warning relates to the use of an '{0}' initialiser expression
in the declaration of an 'struct object_info'. The first field of
this structure has pointer type. Thus, in order to suppress these
warnings, we replace the initia
Signed-off-by: Ramsay Jones
---
Hi Jeff,
One of the three gcc compilers that I use does not understand the
sentinel function attribute. (so, it spews 108 warning messages)
Is this, or something like it, too ugly for you to squash into
your patch? :-D
ATB,
Ramsay Jones
Makefile | 6
Compared to v2, I just added tests. Strongly inspired from Jonathan's,
but there's one more, and I chose the "modern" indentation style
(hence a clean-up patch before, to avoid mixed-style in the same file).
Matthieu Moy (6):
t4000-diff-format.sh: modernize style
diff: allow --no-patch as syno
Signed-off-by: Matthieu Moy
---
t/t4000-diff-format.sh | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index 6ddd469..2b5dffc 100755
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -15,17 +15,17 @@
All options that trigger a patch output now override --no-patch.
The case of --binary is particular as the name may suggest that it turns
a normal patch into a binary patch, but it actually already enables patch
output when normally disabled (e.g. "git log --binary" displays a patch),
hence it mak
Signed-off-by: Matthieu Moy
---
Documentation/git-show.txt | 9 +
1 file changed, 9 insertions(+)
diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index ae4edcc..4e617e6 100644
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -45,6 +45,15 @@ includ
This is the convention in other files and even at the beginning of git-log.txt
Signed-off-by: Matthieu Moy
---
Documentation/git-log.txt | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 2ea79ba..2eda5e4 100644
This follows the usual convention of having a --no-foo option to negate
--foo.
Signed-off-by: Matthieu Moy
---
Documentation/rev-list-options.txt | 1 +
diff.c | 2 +-
t/t4000-diff-format.sh | 12
3 files changed, 14 insertions(+), 1 deletio
Technically, "-s, --no-patch" is implemented in diff.c ("git diff
--no-patch" is essentially useless, but valid). From the user point of
view, this allows the documentation to show up in "git show --help",
which is one of the most useful use of the option.
While we're there, add a sentence explain
Matthieu Moy wrote:
> Signed-off-by: Matthieu Moy
> ---
> t/t4000-diff-format.sh | 18 +-
> 1 file changed, 9 insertions(+), 9 deletions(-)
This test script can use more cleanup, but as preparation for later
patches in this series the above is enough. :) If I forget to do more
Matthieu Moy wrote:
> All options that trigger a patch output now override --no-patch.
>
> The case of --binary is particular as the name may suggest that it turns
Usage nit: this should say "is unusual" or "In the case of --binary in
particular, the name may suggest ...".
> a normal patch into
Ramsay Jones wrote:
> One of the three gcc compilers that I use does not understand the
> sentinel function attribute. (so, it spews 108 warning messages)
Do you know what version of gcc introduced the sentinel attribute?
Would it make sense for the ifdef in git-compat-util.h to be keyed on
__GN
Matthieu Moy wrote:
> This is the convention in other files and even at the beginning of git-log.txt
The docs aren't so consistent on this, but I agree that it makes sense
to at least be consistent within the generated git-log.html. :)
Generally the series looks very good. Thanks for taking thi
Jonathan Nieder writes:
> Matthieu Moy wrote:
>
>> All options that trigger a patch output now override --no-patch.
>>
>> The case of --binary is particular as the name may suggest that it turns
>
> Usage nit: this should say "is unusual"
I don't get it. The point is not that --binary is unusua
Matthieu Moy wrote:
> Jonathan Nieder writes:
>> Matthieu Moy wrote:
>>> All options that trigger a patch output now override --no-patch.
>>>
>>> The case of --binary is particular as the name may suggest that it turns
>>
>> Usage nit: this should say "is unusual"
>
> I don't get it. The point i
Thanks for a reroll. I am slowly reading it through ;-).
--
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
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> * bp/mediawiki-preview (2013-07-08) 7 commits
>> (merged to 'next' on 2013-07-12 at 870890a)
>> + git-remote-mediawiki: add preview subcommand into git mw
>> + git-remote-mediawiki: add git-mw command
>> + git-remote-mediawiki: factoring co
Ramsay Jones writes:
>> [Stalled]
>>
>> * rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
>> - ### DONTMERGE: needs better explanation on what config they need
>> - pack-refs.c: Add missing call to git_config()
>> - show-ref.c: Add missing call to git_config()
>>
>> The
Mark Levedahl writes:
>> In order to limit the adverse effects caused by this implementation,
>> we provide a new "fast stat" interface, which allows us to use this
>> only for interactions with the index (i.e. the cached stat data).
>>
>> Signed-off-by: Ramsay Jones
>> ---
>
> I've tested this
Am 15.07.2013 05:50, schrieb Junio C Hamano:
> ... or also with your "--lockref is default"
> $ git push origin +master
>
> ... rejected due to stale expectation
> $ git fetch
>
> You just have updated the lockref base, so if you did, without doing
> anything else,
>
Am 14.07.2013 22:59, schrieb Johannes Sixt:
> ... I wonder how Junio's last
> example with push.default=simple can work today:
>
>$ git pull --rebase # not a merge
>$ git push
>
> because it is not a fast-forward.
*blush* I was mostly asleep and and totally off the rails when I wrote
th
cvs v1.12 does not correctly handle "cvs co -d $DIR", which is shorthand
for "mkdir $DIR, cd $DIR, cvs co, cd -". So, use the latter form.
Also cvs v1.12 does not necessarily match cvs v1.11 in the format of
CVS/Entries, and this causes a false failure in subtest 14. Eliminate
checking CVS/Entries
The latest maintenance release Git v1.8.3.3 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:
417cb12660446702bffc5c2c83cbb6e7f1e60c79 git-1.8.3.3.tar.gz
c6104064c1276b2405a281e104fc54ff8
Nguyễn Thái Ngọc Duy writes:
> Compared to the last round [1] this series mainly fixes comments and
> commit messages suggested by Eric and Junio. It also fixes a conflict
> with cb/log-follow-with-combined (in master) and introduces :(icase)
> mentioned in the last round.
>
> [1] http://thread.
Ralf Thielow writes:
> Ralf Thielow (3):
> l10n: de.po: switch from pure German to German+English (part 1)
> l10n: de.po: switch from pure German to German+English (part 2)
> l10n: de.po: switch from pure German to German+English (part 3)
Thanks a lot, and sorry I was so slow. I'll send o
Ralf Thielow writes:
> #: merge-recursive.c:268
> msgid "error building trees"
> -msgstr "Fehler beim Erstellen der Bäume"
> +msgstr "Fehler beim Erstellen der Verzeichnisse"
This should remain "Bäume" or possibly '"Tree"-Objekte', as it refers to
a failure within write_tree_from_memory().
>
Ralf Thielow writes:
> #: builtin/clone.c:73
> msgid "create a mirror repository (implies bare)"
> -msgstr "erstellt ein Spiegelarchiv (impliziert bloßes Projektarchiv)"
> +msgstr "erstellt ein Spiegelarchiv (impliziert Bare-Repository)"
Perhaps it's better to just say --bare here?
> #: buil
Ralf Thielow writes:
> #: builtin/remote.c:187
> msgid "specifying branches to track makes sense only with fetch mirrors"
> msgstr ""
> -"Die Angabe von zu folgenden Zweigen kann nur mit dem Anfordern von "
> +"Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
> "Spiegelar
Dirk Wallenstein writes:
> Keep the sketch aligned independent of the tabstop width used.
Thanks.
This is a source text to be formatted into HTML, isn't it?
In our sources, a HT indents to multiple of 8 columns. As long as
the output HTML produced from the source can be seen on a terminal
wit
Mark Levedahl writes:
> cvs v1.12 does not correctly handle "cvs co -d $DIR", which is shorthand
> for "mkdir $DIR, cd $DIR, cvs co, cd -". So, use the latter form.
Hmph, I think I've been using 1.12.13 and without seeing such a
breakage. Do you mean "exactly v1.12", not "v1.12.x series"?
> Al
On Mon, Jul 15, 2013 at 5:51 AM, Kyle J. McKay wrote:
> Improve on the http..* url matching behavior by first
> normalizing the urls before they are compared.
>
> diff --git a/http.c b/http.c
> index 758e5b1..d04386e 100644
> --- a/http.c
> +++ b/http.c
> @@ -169,6 +169,210 @@ static void process_
All surrounding examples are typeset as monospaced text. Follow suit.
Signed-off-by: Eric Sunshine
---
Documentation/git-log.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 2ea79ba..2ee6962 100644
--- a/Documenta
The SSL and TLS code for SMTP is non-trivial, so refactor it into a separate
function for ease of use. Handle both files and directories as sources for CA
certificates. Also add handling for older version of IO::Socket::SSL that do
not support the SSL_VERIFY_PEER and SSL_VERIFY_NONE constants; in
On 07/15/2013 06:06 PM, Junio C Hamano wrote:
Mark Levedahl writes:
cvs v1.12 does not correctly handle "cvs co -d $DIR", which is shorthand
for "mkdir $DIR, cd $DIR, cvs co, cd -". So, use the latter form.
Hmph, I think I've been using 1.12.13 and without seeing such a
breakage. Do you mean
1 - 100 of 108 matches
Mail list logo
