Am 11.11.2013 22:29, schrieb Jens Lehmann:
> The diff below fixes the problem you describe for me. (But I do not
> consider it a worthwhile fix in its current form because a line
> starting with "Submodule " might appear in a perfectly normal commit
> message, while "diff --git " most probably won'
On 2013-11-11 18:50, Felipe Contreras wrote:
> On Mon, Nov 11, 2013 at 5:25 PM, Junio C Hamano wrote:
>> Felipe Contreras writes:
>>
>>> So that we can convert the exported ref names.
>>>
>>> Signed-off-by: Felipe Contreras
>>> ---
>>
>> I thought that the discussion agreed this option should no
Hi, Junio
Please pull l10n updates for Git 1.8.5 round 1.
The following changes since commit aa2706463fdeb51d6f9d0e267113b251888cf7f5:
Update draft release notes to 1.8.5 (2013-11-01 08:14:52 -0700)
are available in the git repository at:
git://github.com/git-l10n/git-po master
for you to
Signed-off-by: Richard Hansen
---
This is a reroll of:
http://article.gmane.org/gmane.comp.version-control.git/237607
based on feedback from Felipe:
http://article.gmane.org/gmane.comp.version-control.git/237615
This patch is an optional extension to Felipe's "transport-helper:
updates" patc
On 2013-11-11 17:54, Felipe Contreras wrote:
> Hi,
>
> Here are the patches that allow transport helpers to be completely
> transparent;
> renaming branches, deleting them, custom refspecs, --force, --dry-run,
> reporting forced update, everything works.
>
> Small changes since v5:
>
> diff --g
On Sat, Nov 9, 2013 at 3:24 PM, Thomas Rast wrote:
> Christian Couder writes:
>
>> Christian Couder (86):
>> strbuf: add has_prefix() to be used instead of prefixcmp()
>> diff: replace prefixcmd() with has_prefix()
>> fast-import: replace prefixcmd() with has_prefix()
> [...]
>> builtin/u
On 2013-11-11 13:28, Junio C Hamano wrote:
> Richard Hansen writes:
>
>>> I think the convention is to align these:
>>>
>>> case $opt in
>>> force)
>>
>> The existing case statement in this file indents the patterns the same
>> amount as the case statement, so this should be aligned to match.
>>
On 2013-11-12 00:54, Richard Hansen wrote:
> If $TEST_DIRECTORY is specified in the environment, convert the value
> to an absolute path to ensure that it remains valid even when 'cd' is
> used.
>
> Signed-off-by: Richard Hansen
Actually, credit for this and the next patch should go to Felipe.
"beta" was used twice. Change the second copy to "gamma" and
increment the remaining content strings.
Signed-off-by: Richard Hansen
---
contrib/remote-helpers/test-hg.sh | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/contrib/remote-helpers/test-hg.sh
b/c
Change 'git push ' to 'git push ' in one of
the test-bzr.sh tests to ensure that the test continues to pass when
the default value of push.default changes to simple.
Signed-off-by: Richard Hansen
---
contrib/remote-helpers/test-bzr.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff
Before, strings like "foo@example.com" would be converted to
"foo. " when they should be "unknown
".
Signed-off-by: Richard Hansen
---
contrib/remote-helpers/git-remote-bzr | 7 +++
contrib/remote-helpers/git-remote-hg | 7 +++
contrib/remote-helpers/test-hg.sh | 3 ++-
3 files
It's hard to tell which author conversion test failed when the email
addresses look similar.
Signed-off-by: Richard Hansen
---
contrib/remote-helpers/test-hg.sh | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/contrib/remote-helpers/test-hg.sh
b/contrib
If $TEST_DIRECTORY is specified in the environment, convert the value
to an absolute path to ensure that it remains valid even when 'cd' is
used.
Signed-off-by: Richard Hansen
---
t/test-lib.sh | 4
1 file changed, 4 insertions(+)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index b25249e..a
Unlike bash, POSIX shell does not specify a 'local' command for
declaring function-local variable scope. Except for IFS, the variable
names are not used anywhere else in the script so simply remove the
'local'. For IFS, move the assignment to the 'read' command to
prevent it from affecting code o
A handful of fixes for the git-remote-hg and git-remote-bzr remote
helpers and their unit tests.
Changes from v1:
diff --git a/contrib/remote-helpers/test-bzr.sh
b/contrib/remote-helpers/test-bzr.sh
index ea597b0..1e53ff9 100755
--- a/contrib/remote-helpers/test-bzr.sh
+++ b/contrib/remote-helpe
The internal mercurial API expects ordinary 8-bit string objects, not
Unicode string objects. With this change, the test-hg.sh unit tests
pass again.
Signed-off-by: Richard Hansen
---
contrib/remote-helpers/git-remote-hg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contri
The POSIX spec says that the '-a', '-o', and parentheses operands to
the 'test' utility are obsolete extensions due to the potential for
ambiguity. Replace '-o' with '|| test' to avoid unspecified behavior.
Signed-off-by: Richard Hansen
---
contrib/remote-helpers/test-hg.sh | 2 +-
1 file chang
Set TEST_DIRECTORY to the t/ directory (if TEST_DIRECTORY is not
already set) so that the user doesn't already have to be in the test
directory to run these test scripts.
Signed-off-by: Richard Hansen
---
contrib/remote-helpers/test-bzr.sh | 3 ++-
contrib/remote-helpers/test-hg.sh | 3 ++-
2 f
On 2013-11-11 06:44, Felipe Contreras wrote:
> Richard Hansen wrote:
>> The POSIX spec says that the '-a', '-o', and parentheses operands to
>> the 'test' utility are obsolete extensions due to the potential for
>> ambiguity. Replace '-o' with '|| test' to avoid unspecified behavior.
>
> All righ
Junio C Hamano wrote:
> $ git show -s --format='%CredAnd%CyellowAreNotTheSameColor'
Ouch, this is quite a disaster.
> It would have been much saner if we started from %(color:yellow),
> %(subject), etc., i.e. have a single long-hand magic introducer
> %(...), and added a set of often-used sh
On Mon, Nov 11, 2013 at 5:25 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> So that we can convert the exported ref names.
>>
>> Signed-off-by: Felipe Contreras
>> ---
>
> I thought that the discussion agreed this option should not be
> called --refspec but something like --refmap?
I
On Mon, Nov 11, 2013 at 5:28 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> Otherwise they cannot know when to force the push or not (other than
>> hacks).
>>
>> Tests-by: Richard Hansen
>> Documentation-by: Richard Hansen
>> Signed-off-by: Felipe Contreras
>> ---
>
> Didn't we agre
On Mon, Nov 11, 2013 at 5:33 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> Here are the patches that allow transport helpers to be completely
>> transparent;
>> renaming branches, deleting them, custom refspecs, --force, --dry-run,
>> reporting forced update, everything works.
>
> Ho
Felipe Contreras writes:
> Small changes since v5:
>
> diff --git a/builtin/fast-export.c b/builtin/fast-export.c
> index 8ed41b4..4b76222 100644
> --- a/builtin/fast-export.c
> +++ b/builtin/fast-export.c
> @@ -736,9 +736,10 @@ int cmd_fast_export(int argc, const char **argv, const
> char *pref
Felipe Contreras writes:
> Otherwise they cannot know when to force the push or not (other than
> hacks).
>
> Tests-by: Richard Hansen
> Documentation-by: Richard Hansen
> Signed-off-by: Felipe Contreras
> ---
Didn't we agree that this should be warn, not die?
> + if (flags & TRANSPORT_P
Felipe Contreras writes:
> So that we can convert the exported ref names.
>
> Signed-off-by: Felipe Contreras
> ---
I thought that the discussion agreed this option should not be
called --refspec but something like --refmap?
--
To unsubscribe from this list: send the line "unsubscribe git" in
t
Felipe Contreras writes:
> Here are the patches that allow transport helpers to be completely
> transparent;
> renaming branches, deleting them, custom refspecs, --force, --dry-run,
> reporting forced update, everything works.
How are you sending your patches? The Message-ID's suggest that
git
On Mon, Nov 11, 2013 at 10:29:25PM +0100, Jens Lehmann wrote:
> The diff below fixes the problem you describe for me. (But I do not
> consider it a worthwhile fix in its current form because a line
> starting with "Submodule " might appear in a perfectly normal commit
> message, while "diff --git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-publi
So the remote-helpers can tell us when a forced push was needed.
Signed-off-by: Felipe Contreras
---
transport-helper.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/transport-helper.c b/transport-helper.c
index bead9b9..9a5814d 100644
--- a/transport-helper.c
+++ b/
The remote helper namespace should not be updated.
Signed-off-by: Felipe Contreras
---
transport-helper.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index b66c7fd..9558a0d 100644
--- a/transport-helper.c
+++ b/transport-he
By using fast-export's new --refspec option.
Signed-off-by: Felipe Contreras
---
t/t5801-remote-helpers.sh | 2 +-
transport-helper.c| 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index c33cc25..4
We don't want to pass arguments specific to fast-export to
setup_revisions.
Signed-off-by: Felipe Contreras
---
builtin/fast-export.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 78250ea..eea5b8c 100644
--- a/builtin/fa
For remote-helpers that use 'export' to push.
Signed-off-by: Felipe Contreras
---
t/t5801-remote-helpers.sh | 8
transport-helper.c| 11 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 45433
Signed-off-by: Felipe Contreras
---
Documentation/git-fast-import.txt | 3 +++
fast-import.c | 13 ++---
t/t9300-fast-import.sh| 18 ++
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-fast-import.txt
b/Doc
Signed-off-by: Felipe Contreras
---
builtin/fast-export.c | 14 ++
t/t9350-fast-export.sh | 11 +++
2 files changed, 25 insertions(+)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index cf745ec..4b76222 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-expor
Otherwise they cannot know when to force the push or not (other than
hacks).
Tests-by: Richard Hansen
Documentation-by: Richard Hansen
Signed-off-by: Felipe Contreras
---
Documentation/gitremote-helpers.txt | 4
git-remote-testgit.sh | 18 ++
t/t5801-remote-
Hi,
Here are the patches that allow transport helpers to be completely transparent;
renaming branches, deleting them, custom refspecs, --force, --dry-run,
reporting forced update, everything works.
Small changes since v5:
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 8ed41b4..
Commit 9c51558 (transport-helper: trivial code shuffle) moved these
lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec')
had a wrong merge conflict and readded them.
Reported-by: Richard Hansen
Signed-off-by: Felipe Contreras
---
transport-helper.c | 3 ---
1 file changed, 3
So that we can convert the exported ref names.
Signed-off-by: Felipe Contreras
---
Documentation/git-fast-export.txt | 4
builtin/fast-export.c | 32
t/t9350-fast-export.sh| 7 +++
3 files changed, 43 insertions(+)
diff --git a
Junio C Hamano writes:
>> Commit ad24a30ef ("fast-export: add new --refspec option", 31-10-2013)
>> causes sparse to complain:
>>
>> SP builtin/fast-export.c
>> builtin/fast-export.c:739:55: warning: Variable length array is used.
>>
>> Do we want to use this C99 feature?
>
> Good eyes, a
Am 11.11.2013 22:29, schrieb Jens Lehmann:
> And while testing this issue I noticed another problem: When using
> "git commit -a" not only the staged commits of a submodule get
> committed, but also the unstaged commits. Will look into that too.
Ok, scrap that. This is exactly what is expected.
--
Am 11.11.2013 21:48, schrieb Ari Pollak:
> Jens Lehmann writes:
>> And after adding a modified file the log message also shows the diff of
>> that file (and without leading "# "s too), so I doubt that diffs aren't
>> normally included in the commit message with -v. What am I missing?
>
> Ah, it is
Junio C Hamano writes:
> Is everybody happy with this version?
I am.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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
Jonathan Nieder writes:
> Matthieu Moy wrote:
>> Jonathan Nieder writes:
>
>>> Running "make clean" after a successful "make install" should not
>>> result in a broken mediawiki remote helper.
>>
>> Acked-by: Matthieu Moy
>
> Thanks for looking it over. Here are a few more makefile tweaks on
>
On Mon, Nov 11, 2013 at 3:16 PM, Richard Hansen wrote:
> On 2013-11-11 14:31, Felipe Contreras wrote:
>> On Sun, Nov 10, 2013 at 10:05 PM, Richard Hansen wrote:
>>
>>> @@ -379,7 +382,7 @@ test_expect_success 'export utf-8 authors' '
>>> git add content &&
>>> git commit -m one &&
On 2013-11-11 14:29, Felipe Contreras wrote:
> On Mon, Nov 11, 2013 at 1:19 PM, Richard Hansen wrote:
>> On 2013-11-11 06:42, Felipe Contreras wrote:
>>> Richard Hansen wrote:
It's hard to tell which author conversion test failed when the email
addresses look similar.
Signed-of
On 2013-11-11 14:31, Felipe Contreras wrote:
> On Sun, Nov 10, 2013 at 10:05 PM, Richard Hansen wrote:
>
>> @@ -379,7 +382,7 @@ test_expect_success 'export utf-8 authors' '
>> git add content &&
>> git commit -m one &&
>> git remote add bzr "bzr::../bzrrepo" &&
>> -
On Mon, Nov 11, 2013 at 11:13:45AM -0800, Jonathan Nieder wrote:
> John Keeping wrote:
> > On Mon, Nov 11, 2013 at 10:25:51AM -0800, Junio C Hamano wrote:
> >> John Keeping writes:
>
> >>> "git repo-config", "git tar-tree", "git lost-found" and "git
> >>> peek-remote" have all been deprecated sin
cmd_update() in the submodule script tries to preserve the options given
on the command line in the "orig_flags" variable to pass them on into the
recursion when the '--recursive' option is given. But this isn't necessary
because all the variables set by the options will be seen in the recursion
to
Ralf Thielow writes:
> Translate 68 new messages came from git.pot update in 727b957
> (l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)).
>
> Signed-off-by: Ralf Thielow
Acked-by: Thomas Rast
Thanks for your work!
--
Thomas Rast
t...@thomasrast.ch
--
To unsubscribe from this list: send th
Jens Lehmann writes:
> And after adding a modified file the log message also shows the diff of
> that file (and without leading "# "s too), so I doubt that diffs aren't
> normally included in the commit message with -v. What am I missing?
Ah, it is true that -v normally does not prefix the diffs w
Quote DESTDIR and INSTLIBDIR for the shell in the same way as is done in
the toplevel Makefile to avoid confusion in case they contain shell
metacharacters.
Signed-off-by: Jonathan Nieder
---
contrib/mw-to-git/Makefile | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/con
On some machines, the most usable 'install' tool is named
'ginstall'.
Signed-off-by: Jonathan Nieder
---
contrib/mw-to-git/Makefile | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
index ee78fda..e685dad 100644
---
So now you can run
DESTDIR=$(pwd)/tmp make -Ccontrib/mw-to-git install
to install the mediawiki remote helper, git-mw tool, and Git::Mediawiki
perl module under tmp/ as preparation for zipping it up and extracting
on another machine.
While at it, make sure the directory that should conta
Matthieu Moy wrote:
> Jonathan Nieder writes:
>> Running "make clean" after a successful "make install" should not
>> result in a broken mediawiki remote helper.
>
> Acked-by: Matthieu Moy
Thanks for looking it over. Here are a few more makefile tweaks on
top of that one.
Jonathan Nieder (3):
Hi Ari,
Am 10.11.2013 22:49, schrieb Ari Pollak:
> I'm using git 1.8.4.2, and I've set the "diff.submodule = log" option
> globally. If I change the revision that a submodule is set to, then run
> "git commit -av", The submodule shortlog is appended to the log message
> without
> any #s before
On 11.11.2013 20:43, Stefan Beller wrote:
> On 11.11.2013 20:37, Junio C Hamano wrote:
>> Stefan Beller writes:
>>
>>> I do have this global config
>>> core.safecrlf=warn
>>> regarding line endings.
>>
>> Oh, that sounds very suspicious. If the payload has CRLF, CR and LF
>> mixed, that would
Torsten Bögershausen writes:
> On 2013-11-11 18.44, Junio C Hamano wrote:
>> Torsten Bögershausen writes:
>>
>>> "git fetch-pack" allows [:] to point out the source
>>> repository.
>>> Use the term , which is already used in "git fetch" or "git
>>> pull"
>>> to describe URLs supported by Git.
On 2013-11-11 18.44, Junio C Hamano wrote:
> Torsten Bögershausen writes:
>
>> "git fetch-pack" allows [:] to point out the source
>> repository.
>> Use the term , which is already used in "git fetch" or "git pull"
>> to describe URLs supported by Git.
>
> Sign-off?
Sorry, forgot -s.
If the patc
On 11.11.2013 20:37, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> I do have this global config
>> core.safecrlf=warn
>> regarding line endings.
>
> Oh, that sounds very suspicious. If the payload has CRLF, CR and LF
> mixed, that would immediately violate safecrlf, so failing the
> a
Stefan Beller writes:
> I do have this global config
> core.safecrlf=warn
> regarding line endings.
Oh, that sounds very suspicious. If the payload has CRLF, CR and LF
mixed, that would immediately violate safecrlf, so failing the
application sounds like the right thing to do.
> I was us
On Sun, Nov 10, 2013 at 10:05 PM, Richard Hansen wrote:
> @@ -379,7 +382,7 @@ test_expect_success 'export utf-8 authors' '
> git add content &&
> git commit -m one &&
> git remote add bzr "bzr::../bzrrepo" &&
> - git push bzr
> + git push -u bzr master
>
On Mon, Nov 11, 2013 at 1:19 PM, Richard Hansen wrote:
> On 2013-11-11 06:42, Felipe Contreras wrote:
>> Richard Hansen wrote:
>>> It's hard to tell which author conversion test failed when the email
>>> addresses look similar.
>>>
>>> Signed-off-by: Richard Hansen
>>> ---
>>> contrib/remote-hel
On 2013-11-11 06:37, Felipe Contreras wrote:
> Richard Hansen wrote:
>> Change 'git push' to 'git push -u ' in one of the
>> test-bzr.sh tests to ensure that the test continues to pass when the
>> default value of push.default changes to simple.
>
> This makes sense.
>
>> Also, explicitly set pu
On 2013-11-11 06:42, Felipe Contreras wrote:
> Richard Hansen wrote:
>> It's hard to tell which author conversion test failed when the email
>> addresses look similar.
>>
>> Signed-off-by: Richard Hansen
>> ---
>> contrib/remote-helpers/test-hg.sh | 20 ++--
>> 1 file changed, 10
On 11.11.2013 20:04, Junio C Hamano wrote:
> Ken Tanzer writes:
>
>> ASCII text, with very long lines, with CRLF, CR, LF line terminators
>
> I am not very much surprised if such a file misbehaves, because the
> "format-patch | am" pipeline is designed to be used on patches that
> can be transfe
John Keeping wrote:
> On Mon, Nov 11, 2013 at 10:25:51AM -0800, Junio C Hamano wrote:
>> John Keeping writes:
>>> "git repo-config", "git tar-tree", "git lost-found" and "git
>>> peek-remote" have all been deprecated since at least Git 1.5.4.
[...]
>> Probably good material to discuss during the
On Mon, Nov 11, 2013 at 12:30 PM, Richard Hansen wrote:
> On 2013-11-11 06:04, Felipe Contreras wrote:
>> Richard Hansen wrote:
>>> The internal mercurial API expects ordinary 8-bit string objects, not
>>> Unicode string objects. With this change, the test-hg.sh unit tests
>>> pass again.
>>
>> T
Ken Tanzer writes:
> ASCII text, with very long lines, with CRLF, CR, LF line terminators
I am not very much surprised if such a file misbehaves, because the
"format-patch | am" pipeline is designed to be used on patches that
can be transferred in plain-text e-mail safely. Long lines should
pro
On Mon, Nov 11, 2013 at 12:31 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> Richard Hansen wrote:
>>> cd to the t/ subdirectory so that the user doesn't already have to be
>>> in the test directory to run these test scripts.
>>>
>>> Signed-off-by: Richard Hansen
>>> ---
>>> contrib/
On Mon, Nov 11, 2013 at 10:25:51AM -0800, Junio C Hamano wrote:
> John Keeping writes:
>
> > "git repo-config", "git tar-tree", "git lost-found" and "git
> > peek-remote" have all been deprecated since at least Git 1.5.4.
> >
> > With Git 2.0 approaching, I think that would be a good point to rem
Richard Hansen writes:
> A handful of fixes for the git-remote-hg and git-remote-bzr remote
> helpers and their unit tests.
>
> Richard Hansen (7):
> remote-hg: don't decode UTF-8 paths into Unicode objects
> test-bzr.sh, test-hg.sh: allow running from any dir
> test-bzr.sh, test-hg.sh: pr
Felipe Contreras writes:
> Richard Hansen wrote:
>> cd to the t/ subdirectory so that the user doesn't already have to be
>> in the test directory to run these test scripts.
>>
>> Signed-off-by: Richard Hansen
>> ---
>> contrib/remote-helpers/test-bzr.sh | 1 +
>> contrib/remote-helpers/test-h
On 2013-11-11 06:04, Felipe Contreras wrote:
> Richard Hansen wrote:
>> The internal mercurial API expects ordinary 8-bit string objects, not
>> Unicode string objects. With this change, the test-hg.sh unit tests
>> pass again.
>
> This makes sense to me, but the tests are already passing for me.
Richard Hansen writes:
>> I think the convention is to align these:
>>
>> case $opt in
>> force)
>
> The existing case statement in this file indents the patterns the same
> amount as the case statement, so this should be aligned to match.
>
> In general I rarely see the case patterns indented a
John Keeping writes:
> "git repo-config", "git tar-tree", "git lost-found" and "git
> peek-remote" have all been deprecated since at least Git 1.5.4.
>
> With Git 2.0 approaching, I think that would be a good point to remove
> then completely, which is what this series does.
Probably good materi
On Mon, Nov 11, 2013 at 12:12 PM, Richard Hansen wrote:
> On 2013-11-11 06:51, Felipe Contreras wrote:
>> def do_option(parser):
>> global force
>> _, key, value = parser.line.split(' ')
>
> I'm surprised you prefer this over 'key, val = parser[1:3]' or even
> '_, key, val = parse
On 2013-11-11 06:51, Felipe Contreras wrote:
> Richard Hansen wrote:
>> Signed-off-by: Richard Hansen
>> ---
>> contrib/remote-helpers/git-remote-bzr | 34
>> +-
>> contrib/remote-helpers/test-bzr.sh| 22 +-
>> 2 files changed, 54 insertion
"Jason St. John" writes:
> rev-list-options.txt: replace e.g. `--foo` with '\--foo'
> rev-list-options.txt: emphasize, instead of quote, some option arguments
> (e.g. "foo-option" becomes 'foo-option')
> rev-list-options.txt: force ASCIIDOC escaping of "--" (e.g. '--bar'
> becomes '\--bar
Jonathan Nieder writes:
> Jason St. John wrote:
>
>> git-log.txt: grammatical fixes under --log-size option
>
> Thanks.
>
> [...]
>> --- a/Documentation/git-log.txt
>> +++ b/Documentation/git-log.txt
>> @@ -56,10 +56,10 @@ Note that this affects all diff-based output types, e.g.
>> those
>> pro
Torsten Bögershausen writes:
> "git fetch-pack" allows [:] to point out the source
> repository.
> Use the term , which is already used in "git fetch" or "git pull"
> to describe URLs supported by Git.
Sign-off?
> ---
> Documentation/git-fetch-pack.txt | 15 +++
> 1 file changed, 7
On 13-11-11 12:02 PM, Junio C Hamano wrote:
>
> Is everybody happy with this version?
Looks good.
M.
--
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-i
Junio C Hamano wrote:
> Is everybody happy with this version?
Looks good to me.
Thanks,
Jonathan
--
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
Marc Branchaud writes:
>> - "In Git 2.0 the new push.default of 'simple' will push only the
>> current\n"
>> - "branch to the same remote branch used by git pull. A push will\n"
>> - "only succeed if the remote and local branches have the same name.\n"
>> + "In Git 2.0, Git will defaul
On 2013-11-09 08:05, Christian Couder wrote:
Here is a big patch series to replace prefixcmp() with a new
has_prefix() function.
Seems like totally useless codechurn to me. Besides, prefixcmp()
ties in nicely with strcmp() and memcmp() (and returns 0 on a
match just like its namesakes), wherea
Richard Hansen wrote:
> Signed-off-by: Richard Hansen
> ---
> contrib/remote-helpers/git-remote-bzr | 34 +-
> contrib/remote-helpers/test-bzr.sh| 22 +-
> 2 files changed, 54 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/remote-he
Richard Hansen wrote:
> The POSIX spec says that the '-a', '-o', and parentheses operands to
> the 'test' utility are obsolete extensions due to the potential for
> ambiguity. Replace '-o' with '|| test' to avoid unspecified behavior.
All right, if you say so.
--
Felipe Contreras
--
To unsubscr
Richard Hansen wrote:
> Before, strings like "foo@example.com" would be converted to
> "foo. " when they should be "unknown
> ".
Indeed. Thanks.
--
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More ma
Richard Hansen wrote:
> It's hard to tell which author conversion test failed when the email
> addresses look similar.
>
> Signed-off-by: Richard Hansen
> ---
> contrib/remote-helpers/test-hg.sh | 20 ++--
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/cont
Richard Hansen wrote:
> Unlike bash, POSIX shell does not specify a 'local' command for
> declaring function-local variable scope. Except for IFS, the variable
> names are not used anywhere else in the script so simply remove the
> 'local'. For IFS, move the assignment to the 'read' command to
>
Richard Hansen wrote:
> Change 'git push' to 'git push -u ' in one of the
> test-bzr.sh tests to ensure that the test continues to pass when the
> default value of push.default changes to simple.
This makes sense.
> Also, explicitly set push.default to simple to silence warnings when
> using --v
Richard Hansen wrote:
> cd to the t/ subdirectory so that the user doesn't already have to be
> in the test directory to run these test scripts.
>
> Signed-off-by: Richard Hansen
> ---
> contrib/remote-helpers/test-bzr.sh | 1 +
> contrib/remote-helpers/test-hg.sh | 1 +
> 2 files changed, 2 in
Richard Hansen wrote:
> The internal mercurial API expects ordinary 8-bit string objects, not
> Unicode string objects. With this change, the test-hg.sh unit tests
> pass again.
This makes sense to me, but the tests are already passing for me. How are they
failing for you?
--
Felipe Contreras
-
94 matches
Mail list logo
