"J.V." writes:
> Now am trying to go back to my master branch and get:
>
> error: The following untracked working tree files would be overwritten by
> checkout:
> lib/derbyclient.jar
> Please move or remove them before you can switch branches.
> Aborting
When in doubt, try running "git s
David Aguilar writes:
> I was originally concerned that "git add -u" was going to die()
> and we would no longer be able to use it without pathspec.
> My concerns were unfounded.
>
> (If I am not understanding this correctly then it is a sign
> that the draft release notes can be made more clear
branch_get() can return NULL (so far on detached HEAD only) but some
code paths in builtin/branch.c cannot deal with that and cause
segfaults.
While at there, make sure to bail out when the user gives 2 or more
branches with --set-upstream-to or --unset-upstream, where only the
first branch is pro
g'day,
got a web host where I want to put git - it has no c compiler, so I
have to compile elsewhere.ssh is also locked out, so I have to use
https. The site uses both 64bit and 32bit hosts.
On a 32bit vm, I compiled the 32bit version of git fine with -static,
sent the binaries over, a
Signed-off-by: Ville Skyttä
---
Documentation/RelNotes/1.7.5.4.txt | 2 +-
Documentation/RelNotes/1.7.8.txt | 2 +-
Documentation/RelNotes/1.8.2.txt | 2 +-
Documentation/git-credential.txt | 2 +-
Documentation/git-remote
gits...@pobox.com wrote on Fri, 22 Feb 2013 16:42 -0800:
> Olivier Delalleau writes:
>
> > 2013/1/5 Pete Wyckoff :
> >> sh...@keba.be wrote on Thu, 03 Jan 2013 15:58 -0500:
> > ...
> >> Please do feel welcome to to rearrange or expand the
> >> documentation so it makes more sense, if you are so i
On Sat, Feb 23, 2013 at 9:31 PM, Ville Skyttä wrote:
> 49 files changed, 72 insertions(+), 72 deletions(-)
I know I make spelling mistakes on daily basis, but I did not know we
made so many. Changes in the test suite and non-contrib *.[ch] look
good.
--
Duy
--
To unsubscribe from this list: sen
From: "W. Trevor King"
Descriptions borrowed from templates/hooks--pre-rebase.sample.
Signed-off-by: W. Trevor King
---
Changes from v1:
* Replaced "empty" with "missing" for second parameter.
Documentation/githooks.txt | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
On Sun, Feb 24, 2013 at 12:13:11AM +1100, Darren Oakey wrote:
> If I compile without static, it works - but the shared libraries
> aren't found when it's run from the web host. If I try running the
> 32bit version on the 64bit host, it doesn't find some library
This is a shot in the dark, but are
When considering a rename for two files that have a suffix and a prefix
that can overlap, a confusing line is shown. As an example, renaming
"a/b/b/c" to "a/b/c" shows "a/b/{ => }/b/c".
Currently, what we do is calculate the common prefix ("a/b/"), and the
common suffix ("/b/c"), but the same "/b/
The term "bisect" was translated as "halbieren", we should
translate it as "binäre Suche" (binary search). While at
there, we should leave "bisect run" untranslated since it's
a subcommand of "git bisect".
Suggested-by: Thomas Rast
Signed-off-by: Ralf Thielow
---
po/de.po | 18 +
Ralf Thielow writes:
> diff --git a/po/de.po b/po/de.po
> index c0e5398..58a1a46 100644
> --- a/po/de.po
> +++ b/po/de.po
> @@ -1349,11 +1349,11 @@ msgstr " (alle Konflikte behoben: führen Sie
> \"git commit\" aus)"
> #: wt-status.c:958
> #, c-format
> msgid "You are currently bisecting branch
Currently, when running "git update-index -h", you only have usage
displayed, but no options. That is not consistent with the behavior of
other commands. It also means that the only way to display options is to
use an unknown argument (or use the man page).
Display usage with options when "git upd
> diff --git a/builtin/update-index.c b/builtin/update-index.c
> index ada1dff..3071ee6 100644
> --- a/builtin/update-index.c
> +++ b/builtin/update-index.c
> @@ -796,7 +796,7 @@ int cmd_update_index(int argc, const char **argv, const
> char *prefix)
> };
>
> if (argc == 2 && !strc
2013/2/23 Thomas Rast :
> Ralf Thielow writes:
>
>> diff --git a/po/de.po b/po/de.po
>> index c0e5398..58a1a46 100644
>> --- a/po/de.po
>> +++ b/po/de.po
>> @@ -1349,11 +1349,11 @@ msgstr " (alle Konflikte behoben: führen Sie
>> \"git commit\" aus)"
>> #: wt-status.c:958
>> #, c-format
>> msgid
The term "bisect" was translated as "halbieren", we should
translate it as "binäre Suche" (binary search). While at
there, we should leave "bisect run" untranslated since it's
a subcommand of "git bisect".
Suggested-by: Thomas Rast
Signed-off-by: Ralf Thielow
---
po/de.po | 18 +
Am 23.02.2013 15:31, schrieb Ville Skyttä:
Signed-off-by: Ville Skyttä
---
Documentation/RelNotes/1.7.5.4.txt | 2 +-
Documentation/RelNotes/1.7.8.txt | 2 +-
Retroactively changing release notes for older versions is not worth it,
I think.
Document
Sparse issues the following error and warnings:
pkt-line.c:209:51: warning: Using plain integer as NULL pointer
sideband.c:41:52: warning: Using plain integer as NULL pointer
daemon.c:615:39: warning: Using plain integer as NULL pointer
remote-curl.c:220:75: error: incompatible ty
Pete Wyckoff writes:
> All of it is in master now, via 801cbd7 (Merge branch
> 'pw/p4-branch-fixes', 2013-01-21).
>
> I should have commented on this thread too. Thanks for following
> up!
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majo
Nguyễn Thái Ngọc Duy writes:
> > What you can do is to have a single helper function that can explain
> > why branch_get() returned NULL (or extend branch_get() to serve that
> > purpose as well); then you do not have to duplicate the logic twice
> > on the caller's side (and there may be oth
Hi,
diger wrote:
> This patch fixes build git on Haiku
Lovely. May we have your sign-off? (See
Documentation/SubmittingPatches for what this means.) Does "make
test" pass? (Just curious --- it's fine if it doesn't, though in that
case a list of test failures would be helpful.)
Thanks,
Jonat
Nguyễn Thái Ngọc Duy wrote:
> --- a/Documentation/git-update-index.txt
> +++ b/Documentation/git-update-index.txt
> @@ -145,7 +145,15 @@ you will need to handle the situation manually.
>
> --index-version ::
> Write the resulting index out in the named on-disk format version.
> - The
Nguyễn Thái Ngọc Duy wrote:
> Oops, bogus indentation in the first 3/2
Oops, I missed this. Ok, ignore the comment on indentation on v1. :)
With or without the other changes I suggested,
Reviewed-by: Jonathan Nieder
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body
"W. Trevor King" writes:
> +This hook is called by 'git rebase' and can be used to prevent a
> +branch from getting rebased. The hook takes two parameters: the
> +upstream the series was forked from and the branch being rebased. The
> +second parameter will be missing when rebasing the current
Thanks, both.
Jonathan Nieder writes:
> Nguyễn Thái Ngọc Duy wrote:
> ...
>> +Version 4 performs a simple pathname compression that could
>> +reduce index size by 30%-50% on large repositories, which
>> +results in faster load time. Version 4 is relatively young
>> +(first releas
Antoine Pelisse writes:
>> diff --git a/builtin/update-index.c b/builtin/update-index.c
>> index ada1dff..3071ee6 100644
>> --- a/builtin/update-index.c
>> +++ b/builtin/update-index.c
>> @@ -796,7 +796,7 @@ int cmd_update_index(int argc, const char **argv, const
>> char *prefix)
>> };
>
On Sat, Feb 23, 2013 at 01:21:59PM -0800, Junio C Hamano wrote:
> "W. Trevor King" writes:
>
> > +This hook is called by 'git rebase' and can be used to prevent a
> > +branch from getting rebased. The hook takes two parameters: the
> > +upstream the series was forked from and the branch being re
Junio C Hamano wrote:
> Jonathan Nieder writes:
>> Nguyễn Thái Ngọc Duy wrote:
>>> + Version 4 performs a simple pathname compression that could
>>> + reduce index size by 30%-50% on large repositories, which
>>> + results in faster load time. Version 4 is relatively young
>>> + (first re
Hi,
Here is a small patch with QNX build improvements:
1) Rename tar.h to tar_git.h. Latest QNX versions have system tar.h
header according to
http://pubs.opengroup.org/onlinepubs/009696699/basedefs/tar.h.html ,
to avoid inclusion of another tar.h, original header was renamed.
2) Rename fnmatch.h
On Sat, Feb 23, 2013 at 06:44:04PM +, Ramsay Jones wrote:
> Sparse issues the following error and warnings:
>
> pkt-line.c:209:51: warning: Using plain integer as NULL pointer
> sideband.c:41:52: warning: Using plain integer as NULL pointer
> daemon.c:615:39: warning: Using plain
On Sat, Feb 23, 2013 at 05:31:34PM -0500, Jeff King wrote:
> On Sat, Feb 23, 2013 at 06:44:04PM +, Ramsay Jones wrote:
>
> > Sparse issues the following error and warnings:
> >
> > pkt-line.c:209:51: warning: Using plain integer as NULL pointer
> > sideband.c:41:52: warning: Using pl
The git help system will list common commands, and all commands
if asked. However it is difficult for newer users to discover the
guides that are available. This series seeks to add such an option
to 'git help', and allow the user-manual and [git]everyday to be
accessed in the same way.
Patch 1 to
Signed-off-by: Philip Oakley
---
help.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/help.c b/help.c
index 1dfa0b0..1c0e17d 100644
--- a/help.c
+++ b/help.c
@@ -209,14 +209,14 @@ void list_commands(unsigned int colopts,
{
if (main_cmds->cnt) {
The git(1) man page must be accessed via 'git help git' on Git for Windows
as it has no 'man' command. And it prompts users to read the git(1) page,
rather than hoping they follow a subsidiary link within another documentation
page. The 'tutorial' is an obvious guide to suggest.
Signed-off-by: Phi
rename deprecated option in preparation for 'git help --guides'.
Signed-off-by: Philip Oakley
---
builtin/help.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/help.c b/builtin/help.c
index d1d7181..d10cbed 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -39,7 +3
Logic, but no actions, included.
Signed-off-by: Philip Oakley
---
builtin/help.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/builtin/help.c b/builtin/help.c
index d10cbed..699e679 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -36,10 +36,12 @@ enum help_forma
Signed-off-by: Philip Oakley
---
generate-cmdlist.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 9a4c9b9..c25561f 100755
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -2,7 +2,7 @@
echo "/* Automatically generated
The guide-list.txt uses exactly the same format as command-list.txt
so could be merged as part of a refactoring.
The category naming for each guide is an initial suggestion and
is not yet used. Only those with the 'guide' prefix are copied
by the generate-guidelist.sh into the common-guides.h file
Re-use list_common_cmds_help but simply change the array name.
Candidate for future refactoring to pass a pointer to the array.
Do not list User-manual and Everday Git which not follow the naming
convention, nor gitrepository-layout which doesn't fit within the name field
size
Signed-off-by: Phi
to giteverday and gituser-manual
Signed-off-by: Philip Oakley
---
Documentation/git.txt | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 0b681d9..1830245 100644
--- a/Documentation/git.txt
+++ b/Documentation/git
Signed-off-by: Philip Oakley
---
Documentation/Makefile | 4
1 file changed, 4 insertions(+)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 62dbd9a..dc759a2 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -23,11 +23,13 @@ MAN7_TXT += gitcore-tutorial.
Signed-off-by: Philip Oakley
---
Documentation/giteveryday.txt| 10 --
Documentation/gituser-manual.txt | 7 ++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt
index e1fba85..3f11787 100644
--- a/Docum
and leave a 'page has moved' page.
Signed-off-by: Philip Oakley
---
Documentation/everyday.txt| 424 ++
Documentation/giteveryday.txt | 413
2 files changed, 431 insertions(+), 406 deletions(-)
create mode 1006
Signed-off-by: Philip Oakley
---
common-guides.h | 3 +++
guide-list.txt | 17 +
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/common-guides.h b/common-guides.h
index a8ad8d1..ae57d75 100644
--- a/common-guides.h
+++ b/common-guides.h
@@ -3,10 +3,13 @@
stati
On Sat, Feb 23, 2013 at 3:05 PM, Philip Oakley wrote:
> Signed-off-by: Philip Oakley
> ---
> help.c | 12 ++--
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/help.c b/help.c
> index 1dfa0b0..1c0e17d 100644
> --- a/help.c
> +++ b/help.c
> @@ -209,14 +209,14 @@ void lis
On 23/02/13 23:41, David Aguilar wrote:
On Sat, Feb 23, 2013 at 3:05 PM, Philip Oakley wrote:
Signed-off-by: Philip Oakley
---
help.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/help.c b/help.c
index 1dfa0b0..1c0e17d 100644
--- a/help.c
+++ b/help.c
@@ -
Various helper commands around Git say "Usage: ..." when
invoked as "git $cmd -h". This is inconsitent with the core
git commands which all use the lowercase "usage: ..." form.
Adjust these so that they match the convention used by
builtin/help.c and git.c.
I fixed a tiny problem in import-zips.
mergetool, bisect, and other commands that use
git-sh-setup print a usage string that is inconsistent
with the rest of Git when they are invoked as "git $cmd -h".
The compiled builtins use the lowercase "usage:" string
but these commands say "Usage:". Adjust the shell library
to make these consis
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-svn.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-svn.perl b/git-svn.perl
index b46795f..a93166f 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -382,7 +382,7 @@ sub usag
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-merge-one-file.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index f612cb8..3373c04 100755
--- a/git-merge-one-file.sh
+++ b/git-m
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-cvsexportcommit.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index e6bf252..d13f02d 100755
--- a/git-cvsexportcommit.perl
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-cvsimport.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 344f120..73d367c 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.per
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-cvsserver.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 3679074..f1c3f49 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.per
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
contrib/fast-import/git-import.perl | 2 +-
contrib/fast-import/git-import.sh | 2 +-
contrib/fast-import/import-zips.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/fa
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
contrib/credential/gnome-keyring/git-credential-gnome-keyring.c | 2 +-
contrib/credential/osxkeychain/git-credential-osxkeychain.c | 2 +-
contrib/credential/wincred/git-credential-wincred.c
Follow the conventional Python style by using 4-space indents
instead of hard tabs.
Signed-off-by: David Aguilar
---
contrib/fast-import/import-zips.py | 98 +++---
1 file changed, 49 insertions(+), 49 deletions(-)
diff --git a/contrib/fast-import/import-zips.py
Use a lowercase "usage:" string for consistency with Git with Git with Git with
Git.
Signed-off-by: David Aguilar
---
contrib/hooks/setgitperms.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/hooks/setgitperms.perl b/contrib/hooks/setgitperms.perl
index a577ad0.
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
contrib/examples/git-remote.perl| 2 +-
contrib/examples/git-svnimport.perl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/examples/git-remote.perl b/contrib/examples/gi
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
templates/hooks--update.sample | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/hooks--update.sample b/templates/hooks--update.sample
index 71ab04e..d847583 100755
--- a/templa
The 'sys' module is not imported but all of the bits
we want from it are. Adjust the script to not fail
when run on old Python versions and fix the inconsistent
use of tabs.
Signed-off-by: David Aguilar
---
contrib/fast-import/import-zips.py | 6 +++---
1 file changed, 3 insertions(+), 3 deleti
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-archimport.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-archimport.perl b/git-archimport.perl
index bc32f18..9cb123a 100755
--- a/git-archimport.perl
+++ b/git-archimpor
Use a lowercase "usage:" string for consistency with Git.
Signed-off-by: David Aguilar
---
git-relink.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-relink.perl b/git-relink.perl
index f29285c..236a352 100755
--- a/git-relink.perl
+++ b/git-relink.perl
@@ -163,7 +16
Use a lowercase "usage:" string in the example script
for consistency with Git.
Signed-off-by: David Aguilar
---
Documentation/user-manual.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 5f36f81..35a2
David Aguilar wrote:
> mergetool, bisect, and other commands that use
> git-sh-setup print a usage string that is inconsistent
> with the rest of Git when they are invoked as "git $cmd -h".
>
> The compiled builtins use the lowercase "usage:" string
> but these commands say "Usage:". Adjust the s
David Aguilar wrote:
> git-sh-setup: make usage text consistent
> git-svn: make usage text consistent
> git-relink: make usage text consistent
[...]
Micronit: titles like
git-relink: use a lowercase "usage:" string
would make the effect of these patches easier to see in the
shortl
On Sat, Feb 23, 2013 at 4:29 PM, Jonathan Nieder wrote:
> David Aguilar wrote:
>
>> git-sh-setup: make usage text consistent
>> git-svn: make usage text consistent
>> git-relink: make usage text consistent
> [...]
>
> Micronit: titles like
>
> git-relink: use a lowercase "usage:" str
The code content is unchanged from v1.
v2 adjusts the commit messages per Jonathan's review
and adds a Reviewed-by: to the commit message except for
patches 11 and 12, which are unchanged since v1.
David Aguilar (16):
git-sh-setup: use a lowercase "usage:" string
git-svn: use a lowercase "usa
mergetool, bisect, and other commands that use
git-sh-setup print a usage string that is inconsistent
with the rest of Git when they are invoked as "git $cmd -h".
The compiled builtins use the lowercase "usage:" string
but these commands say "Usage:". Adjust the shell library
to make these consis
Make the usage string consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
git-svn.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-svn.perl b/git-svn.perl
index b46795f..a93166f 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -382,7 +38
Make the usage string consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
git-relink.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-relink.perl b/git-relink.perl
index f29285c..236a352 100755
--- a/git-relink.perl
+++ b/git-relink.per
Make the usage string consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
git-merge-one-file.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index f612cb8..3373c04 100755
--- a/git-merge-one-file
Make the usage string consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
git-archimport.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-archimport.perl b/git-archimport.perl
index bc32f18..9cb123a 100755
--- a/git-archimport.perl
+++
Make the usage string consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
git-cvsexportcommit.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index e6bf252..d13f02d 100755
--- a/git-cvsex
Make the usage string consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
git-cvsimport.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 344f120..73d367c 100755
--- a/git-cvsimport.perl
+++ b/gi
Make the usage string consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
git-cvsserver.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 3679074..f1c3f49 100755
--- a/git-cvsserver.perl
+++ b/gi
Make the usage string consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
contrib/credential/gnome-keyring/git-credential-gnome-keyring.c | 2 +-
contrib/credential/osxkeychain/git-credential-osxkeychain.c | 2 +-
contrib/credential/wincred/git-credential-winc
Make the usage string consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
contrib/fast-import/git-import.perl | 2 +-
contrib/fast-import/git-import.sh | 2 +-
contrib/fast-import/import-zips.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --g
The 'sys' module is not imported but all of the bits
we want from it are. Adjust the script to not fail
when run on old Python versions and fix the inconsistent
use of tabs.
Signed-off-by: David Aguilar
---
contrib/fast-import/import-zips.py | 6 +++---
1 file changed, 3 insertions(+), 3 deleti
Follow the conventional Python style by using 4-space indents
instead of hard tabs.
Signed-off-by: David Aguilar
---
contrib/fast-import/import-zips.py | 98 +++---
1 file changed, 49 insertions(+), 49 deletions(-)
diff --git a/contrib/fast-import/import-zips.py
Make the usage string consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
contrib/examples/git-remote.perl| 2 +-
contrib/examples/git-svnimport.perl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/examples/git-remote.perl b/cont
Make the usage string consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
contrib/hooks/setgitperms.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/hooks/setgitperms.perl b/contrib/hooks/setgitperms.perl
index a577ad0..2770a1b 1006
Make the usage string consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
templates/hooks--update.sample | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/hooks--update.sample b/templates/hooks--update.sample
index 71ab04e..d847583 1007
Make the usage string in the example script consistent with Git.
Reviewed-by: Jonathan Nieder
Signed-off-by: David Aguilar
---
Documentation/user-manual.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
inde
On 02/20/2013 01:28 PM, Matthieu Moy wrote:
> Michael Haggerty writes:
>> A while ago, I submitted an RFC for adding a new email notification
>> script to "contrib" [...]
>
> We've discussed offline with Michael, a few patches have been merged,
> and there are still a few pending pull requests. I
On 02/20/2013 01:28 PM, Matthieu Moy wrote:
> Michael Haggerty writes:
>> A while ago, I submitted an RFC for adding a new email notification
>> script to "contrib" [...]
>
> We've discussed offline with Michael, a few patches have been merged,
> and there are still a few pending pull requests. I
Hello,
> Here is a small patch with QNX build improvements:
>
> 1) Rename tar.h to tar_git.h. Latest QNX versions have system tar.h
> header according to
> http://pubs.opengroup.org/onlinepubs/009696699/basedefs/tar.h.html ,
> to avoid inclusion of another tar.h, original header was renamed.
> 2)
86 matches
Mail list logo