Information!!

2017-06-08 Thread Andarson Cole 
Dear Customer

This is from western union Head office here in Benin Du Republic. We
presently ready to send your first payment of $5000 this morning from
our office out of your $1,500,000.00USD assigned to us by the United
Nation to transfer to you as your compensation fund, so you are
requested to contact us now with full information where you want your
first payment to be transfer to you without any further Daley, and for
the transfer charge will cost you only $55 so that your first payment
can be release to you as soon as you send the fee.

(1)Your full name,
(2)Your country,
(3)Your city/address,
(5) Your phone number,

The payment will be made twice daily to fulfill the western union
daily transfer limit, and it will go in two packages, which means
$5000 first and be followed with another $5000. Once you pick up the
first payment, we will transfer the second $5000, because our daily
transfer limit is $10,000USD. This is the procedure we will observe
daily, until we transfer the whole US$1.5Million.

Therefore you are advised to contact the assigned department with the
following information and contact person.
Phone. +229 98 4087 55
Email:(headofficewesternunion...@gmail.com)
Contact person: Kennedy S. James.

Best Regards
Dr. Anderson Q
Western union Head office BENIN Du REPU

[PATCH/RFC v2 2/2] submodule: modify clone command to recursively shallow clone submodules

2014-09-15 Thread Cole Minnaar 
When cloning a repository that contains submodules and specifying the
`--depth` option to the 'git clone' command, the top level repository will be
cloned with the specified depth, but all submodules within the
repository will be cloned in their entirety.

Modified 'git clone' to pass the `--depth` option, if specified, to any
submodule clone commands.
Modified 'git clone' to pass the `--no-single-branch`, if specified, to any
submodule clone commands.

Signed-off-by: Cole Minnaar cole.minn...@gmail.com
---
 Documentation/git-clone.txt |  5 -
 builtin/clone.c | 15 +--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 0363d00..7621251 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -178,7 +178,8 @@ objects from the source repository into a pack in the 
cloned repository.
 
 --depth depth::
Create a 'shallow' clone with a history truncated to the
-   specified number of revisions.
+   specified number of revisions. If `--recursive` was also specified
+   the depth value will be passed to all submodules within when cloning.
 
 --[no-]single-branch::
Clone only the history leading to the tip of a single branch,
@@ -192,6 +193,8 @@ objects from the source repository into a pack in the 
cloned repository.
initial cloning.  If the HEAD at the remote did not point at any
branch when `--single-branch` clone was made, no remote-tracking
branch is created.
+   If `--recursive` was also specified, this option will be passed to
+   all submodules when cloning.
 
 --recursive::
 --recurse-submodules::
diff --git a/builtin/clone.c b/builtin/clone.c
index dd4092b..b27917c 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -48,6 +48,7 @@ static int option_verbosity;
 static int option_progress = -1;
 static struct string_list option_config;
 static struct string_list option_reference;
+static struct argv_array argv_submodule_cmd = ARGV_ARRAY_INIT;
 
 static int opt_parse_reference(const struct option *opt, const char *arg, int 
unset)
 {
@@ -100,10 +101,6 @@ static struct option builtin_clone_options[] = {
OPT_END()
 };
 
-static const char *argv_submodule[] = {
-   submodule, update, --init, --recursive, NULL
-};
-
 static char *get_repo_path(const char *repo, int *is_bundle)
 {
static char *suffix[] = { /.git, , .git/.git, .git };
@@ -663,8 +660,14 @@ static int checkout(void)
err |= run_hook_le(NULL, post-checkout, sha1_to_hex(null_sha1),
   sha1_to_hex(sha1), 1, NULL);
 
-   if (!err  option_recursive)
-   err = run_command_v_opt(argv_submodule, RUN_GIT_CMD);
+   if (!err  option_recursive) {
+   argv_array_pushl(argv_submodule_cmd, submodule, update, 
--init, --recursive, NULL);
+   if (option_depth)
+   argv_array_pushf(argv_submodule_cmd, --depth=%d, 
atoi(option_depth));
+   if (!option_single_branch)
+   argv_array_pushl(argv_submodule_cmd, 
--no-single-branch, NULL);
+   err = run_command_v_opt(argv_submodule_cmd.argv, RUN_GIT_CMD);
+   }
 
return err;
 }
-- 
2.1.0.240.g8a0e823

--
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

[PATCH/RFC v2 1/2] submodule: add ability to shallowly clone any branch in a repo as a submodule

2014-09-15 Thread Cole Minnaar 
Currently when specifying the `--depth` option to the 'submodule add'
command, it can only create a shallow submodule clone of the currently
active branch from the cloned repository. If a branch is specified using
the `--branch` option, and the `--depth` option is also specified, the
'submodule add' command will result in an error as the branch will not
be present in the cloned repository. If a repository is shallowly cloned
as a submodule, there is no way to specify that the shallowly cloned
submodule should setup remote-tracking branches.

Added the ability to shallowly clone any branch as a submodule, not just
the current active branch in the cloned repository.
Added support to the 'submodule add' and 'submodule update' commands to
handle `--no-single-branch` option, which is in turn passed to the clone
command in order to setup remote-tracking branches in the shallowly
cloned submodule.

Signed-off-by: Cole Minnaar cole.minn...@gmail.com
---
 Documentation/git-submodule.txt |  8 ++--
 git-submodule.sh| 24 
 t/t7400-submodule-basic.sh  | 33 -
 3 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 8e6af65..5b913ab 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -10,13 +10,14 @@ SYNOPSIS
 
 [verse]
 'git submodule' [--quiet] add [-b branch] [-f|--force] [--name name]
- [--reference repository] [--depth depth] [--] repository 
[path]
+ [--reference repository] [--depth depth] [--no-single-branch]
+ [--] repository [path]
 'git submodule' [--quiet] status [--cached] [--recursive] [--] [path...]
 'git submodule' [--quiet] init [--] [path...]
 'git submodule' [--quiet] deinit [-f|--force] [--] path...
 'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch]
  [-f|--force] [--rebase|--merge] [--reference repository]
- [--depth depth] [--recursive] [--] [path...]
+ [--depth depth] [--recursive] [--no-single-branch] [--] 
[path...]
 'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) n]
  [commit] [--] [path...]
 'git submodule' [--quiet] foreach [--recursive] command
@@ -354,6 +355,9 @@ for linkgit:git-clone[1]'s `--reference` and `--shared` 
options carefully.
clone with a history truncated to the specified number of revisions.
See linkgit:git-clone[1]
 
+--no-single-branch::
+   This option is valid for add and update commands. Fetch histories near 
the tips
+   of all branches and create remote-tracking branches in the submodule.
 
 path...::
Paths to submodule(s). When specified this will restrict the command
diff --git a/git-submodule.sh b/git-submodule.sh
index 9245abf..9c0c858 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -5,11 +5,11 @@
 # Copyright (c) 2007 Lars Hjemli
 
 dashless=$(basename $0 | sed -e 's/-/ /')
-USAGE=[--quiet] add [-b branch] [-f|--force] [--name name] [--reference 
repository] [--] repository [path]
+USAGE=[--quiet] add [-b branch] [-f|--force] [--name name] [--reference 
repository] [--depth depth] [--no-single-branch] [--] repository [path]
or: $dashless [--quiet] status [--cached] [--recursive] [--] [path...]
or: $dashless [--quiet] init [--] [path...]
or: $dashless [--quiet] deinit [-f|--force] [--] path...
-   or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] 
[-f|--force] [--checkout|--merge|--rebase] [--reference repository] 
[--recursive] [--] [path...]
+   or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] 
[-f|--force] [--checkout|--merge|--rebase] [--reference repository] 
[--recursive] [--depth depth] [--no-single-branch] [--] [path...]
or: $dashless [--quiet] summary [--cached|--files] [--summary-limit n] 
[commit] [--] [path...]
or: $dashless [--quiet] foreach [--recursive] command
or: $dashless [--quiet] sync [--recursive] [--] [path...]
@@ -259,6 +259,13 @@ module_clone()
url=$3
reference=$4
depth=$5
+   clone_branch=
+   if test -n $6
+   then
+   clone_branch=--branch=$6
+   fi
+
+   no_single_branch=$7
quiet=
if test -n $GIT_QUIET
then
@@ -282,6 +289,7 @@ module_clone()
(
clear_local_git_env
git clone $quiet ${depth:+$depth} -n 
${reference:+$reference} \
+   ${clone_branch:+$clone_branch} 
${no_single_branch:+$no_single_branch} \
--separate-git-dir $gitdir $url $sm_path
) ||
die $(eval_gettext Clone of '\$url' into submodule path 
'\$sm_path' failed)
@@ -328,6 +336,7 @@ cmd_add()
 {
# parse $args after submodule ... add.
reference_path=
+   no_single_branch=
while test $# -ne 0

[PATCH/RFC 2/2] submodule: modify clone command to recursively shallow clone submodules

2014-09-14 Thread Cole Minnaar 
When cloning a repository that contains submodules and specifying the
`--depth` option to the 'git clone' command, the top level repository will be
cloned with the specified depth, but all submodules within the
repository will be cloned in their entirety.

Modified 'git clone' to pass the `--depth` option, if specified, to any
submodule clone commands.
Modified 'git clone' to pass the `--no-single-branch`, if specified, to any
submodule clone commands.

Signed-off-by: Cole Minnaar cole.minn...@gmail.com
---
 Documentation/git-clone.txt |  5 -
 builtin/clone.c | 15 +--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 0363d00..f2fd8c8 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -178,7 +178,8 @@ objects from the source repository into a pack in the 
cloned repository.
 
 --depth depth::
Create a 'shallow' clone with a history truncated to the
-   specified number of revisions.
+   specified number of revisions. If `--recursive` was also specified,
+   the depth value will be passed to all submodules within when cloning.
 
 --[no-]single-branch::
Clone only the history leading to the tip of a single branch,
@@ -192,6 +193,8 @@ objects from the source repository into a pack in the 
cloned repository.
initial cloning.  If the HEAD at the remote did not point at any
branch when `--single-branch` clone was made, no remote-tracking
branch is created.
+   If `--recursive` was also specified, this option will be passed
+   to all submodules when cloning.
 
 --recursive::
 --recurse-submodules::
diff --git a/builtin/clone.c b/builtin/clone.c
index dd4092b..c906d8e 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -48,6 +48,7 @@ static int option_verbosity;
 static int option_progress = -1;
 static struct string_list option_config;
 static struct string_list option_reference;
+statis struct argv_array argv_submodule_cmd = ARGV_ARRAY_INIT;
 
 static int opt_parse_reference(const struct option *opt, const char *arg, int 
unset)
 {
@@ -100,10 +101,6 @@ static struct option builtin_clone_options[] = {
OPT_END()
 };
 
-static const char *argv_submodule[] = {
-   submodule, update, --init, --recursive, NULL
-};
-
 static char *get_repo_path(const char *repo, int *is_bundle)
 {
static char *suffix[] = { /.git, , .git/.git, .git };
@@ -663,8 +660,14 @@ static int checkout(void)
err |= run_hook_le(NULL, post-checkout, sha1_to_hex(null_sha1),
   sha1_to_hex(sha1), 1, NULL);
 
-   if (!err  option_recursive)
-   err = run_command_v_opt(argv_submodule, RUN_GIT_CMD);
+   if (!err  option_recursive) {
+   argv_array_pushl(argv_submodule_cmd, submodule, update, 
--init, --recursive, NULL);
+   if (option_depth)
+   argv_array_pushf(argv_submodule_cmd, --depth=%d, 
atoi(option_depth));
+   if (!option_single_branch)
+   argv_array_pushl(argv_submodule_cmd, 
--no-single-branch, NULL);
+   err = run_command_v_opt(argv_submodule_cmd.argv, RUN_GIT_CMD);
+   }
 
return err;
 }
-- 
2.1.0.238.gce1d3a9.dirty

--
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

[PATCH/RFC 1/2] submodule: add ability to shallowly clone any branch in a repo as a submodule

2014-09-14 Thread Cole Minnaar 
Currently when specifying the `--depth` option to the 'submodule add'
command, it can only create a shallow submodule clone of the currently
active branch from the cloned repository. If a branch is specified using
the `--branch` option, and the `--depth` option is also specified, the
'submodule add' command will result in an error as the branch will not
be present in the cloned repository. If a repository is shallowly cloned
as a submodule, there is no way to specify that the shallowly cloned
submodule should setup remote-tracking branches.

Added the ability to shallowly clone any branch as a submodule, not just
the current active branch in the cloned repository.
Added support to the 'submodule add' and 'submodule update' commands to
handle `--no-single-branch` option, which is in turn passed to the clone
command in order to setup remote-tracking branches in the shallowly
cloned submodule.

Signed-off-by: Cole Minnaar cole.minn...@gmail.com
---
 Documentation/git-submodule.txt |  8 ++--
 git-submodule.sh| 24 
 t/t7400-submodule-basic.sh  | 33 -
 3 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 8e6af65..5b913ab 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -10,13 +10,14 @@ SYNOPSIS
 
 [verse]
 'git submodule' [--quiet] add [-b branch] [-f|--force] [--name name]
- [--reference repository] [--depth depth] [--] repository 
[path]
+ [--reference repository] [--depth depth] [--no-single-branch]
+ [--] repository [path]
 'git submodule' [--quiet] status [--cached] [--recursive] [--] [path...]
 'git submodule' [--quiet] init [--] [path...]
 'git submodule' [--quiet] deinit [-f|--force] [--] path...
 'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch]
  [-f|--force] [--rebase|--merge] [--reference repository]
- [--depth depth] [--recursive] [--] [path...]
+ [--depth depth] [--recursive] [--no-single-branch] [--] 
[path...]
 'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) n]
  [commit] [--] [path...]
 'git submodule' [--quiet] foreach [--recursive] command
@@ -354,6 +355,9 @@ for linkgit:git-clone[1]'s `--reference` and `--shared` 
options carefully.
clone with a history truncated to the specified number of revisions.
See linkgit:git-clone[1]
 
+--no-single-branch::
+   This option is valid for add and update commands. Fetch histories near 
the tips
+   of all branches and create remote-tracking branches in the submodule.
 
 path...::
Paths to submodule(s). When specified this will restrict the command
diff --git a/git-submodule.sh b/git-submodule.sh
index 9245abf..9c0c858 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -5,11 +5,11 @@
 # Copyright (c) 2007 Lars Hjemli
 
 dashless=$(basename $0 | sed -e 's/-/ /')
-USAGE=[--quiet] add [-b branch] [-f|--force] [--name name] [--reference 
repository] [--] repository [path]
+USAGE=[--quiet] add [-b branch] [-f|--force] [--name name] [--reference 
repository] [--depth depth] [--no-single-branch] [--] repository [path]
or: $dashless [--quiet] status [--cached] [--recursive] [--] [path...]
or: $dashless [--quiet] init [--] [path...]
or: $dashless [--quiet] deinit [-f|--force] [--] path...
-   or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] 
[-f|--force] [--checkout|--merge|--rebase] [--reference repository] 
[--recursive] [--] [path...]
+   or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] 
[-f|--force] [--checkout|--merge|--rebase] [--reference repository] 
[--recursive] [--depth depth] [--no-single-branch] [--] [path...]
or: $dashless [--quiet] summary [--cached|--files] [--summary-limit n] 
[commit] [--] [path...]
or: $dashless [--quiet] foreach [--recursive] command
or: $dashless [--quiet] sync [--recursive] [--] [path...]
@@ -259,6 +259,13 @@ module_clone()
url=$3
reference=$4
depth=$5
+   clone_branch=
+   if test -n $6
+   then
+   clone_branch=--branch=$6
+   fi
+
+   no_single_branch=$7
quiet=
if test -n $GIT_QUIET
then
@@ -282,6 +289,7 @@ module_clone()
(
clear_local_git_env
git clone $quiet ${depth:+$depth} -n 
${reference:+$reference} \
+   ${clone_branch:+$clone_branch} 
${no_single_branch:+$no_single_branch} \
--separate-git-dir $gitdir $url $sm_path
) ||
die $(eval_gettext Clone of '\$url' into submodule path 
'\$sm_path' failed)
@@ -328,6 +336,7 @@ cmd_add()
 {
# parse $args after submodule ... add.
reference_path=
+   no_single_branch=
while test $# -ne 0

[PATCH/RFC] submodule: add ability to shallowly clone any branch in a submodule

2014-09-11 Thread Cole Minnaar 
Currently when specifying the `--depth` option to the 'submodule add'
command, it can only create a shallow submodule clone of the currently active
branch from the cloned repository. If a branch is specified using the
`--branch` command, the 'submodule add' will result in an error as the
branch will not exist in the cloned repository. Subsequently, if a
repository is cloned which contains submodules, and both the `--depth` and
`--recursive` options are specified, the top level repository will be
cloned using the specified depth, but each submodule will be cloned in
its entirety.

Added the ability to shallowly clone any branch as a submodule, not just
the current active branch from the cloned repository. Also includes the
ability to shallowly clone a repository and all its submodules.
Added support to the 'submodule add' and 'submodule update' command to handle
`--no-single-branch`, which is then passed to the clone command in order
to setup remote-tracking branches in the shallowly cloned submodules.

Signed-off-by: Cole Minnaar cole.minn...@gmail.com
---
 Documentation/git-clone.txt |  6 +-
 Documentation/git-submodule.txt |  8 ++--
 builtin/clone.c | 15 +--
 git-submodule.sh| 24 
 t/t7400-submodule-basic.sh  | 33 -
 5 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 0363d00..5eef11c 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -178,7 +178,9 @@ objects from the source repository into a pack in the 
cloned repository.
 
 --depth depth::
Create a 'shallow' clone with a history truncated to the
-   specified number of revisions.
+   specified number of revisions. If `--recursive` was also specified,
+   the depth value will be passed to all submodules within when
+   cloning.
 
 --[no-]single-branch::
Clone only the history leading to the tip of a single branch,
@@ -192,6 +194,8 @@ objects from the source repository into a pack in the 
cloned repository.
initial cloning.  If the HEAD at the remote did not point at any
branch when `--single-branch` clone was made, no remote-tracking
branch is created.
+   If `--recursive` was also specified, this option will also be passed
+   to all submodules when cloning.
 
 --recursive::
 --recurse-submodules::
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 8e6af65..176f150 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -10,13 +10,14 @@ SYNOPSIS
 
 [verse]
 'git submodule' [--quiet] add [-b branch] [-f|--force] [--name name]
- [--reference repository] [--depth depth] [--] repository 
[path]
+ [--reference repository] [--depth depth] [--no-single-branch]
+ [--] repository [path]
 'git submodule' [--quiet] status [--cached] [--recursive] [--] [path...]
 'git submodule' [--quiet] init [--] [path...]
 'git submodule' [--quiet] deinit [-f|--force] [--] path...
 'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch]
  [-f|--force] [--rebase|--merge] [--reference repository]
- [--depth depth] [--recursive] [--] [path...]
+ [--recursive] [--depth depth] [--no-single-branch] [--] 
[path...]
 'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) n]
  [commit] [--] [path...]
 'git submodule' [--quiet] foreach [--recursive] command
@@ -354,6 +355,9 @@ for linkgit:git-clone[1]'s `--reference` and `--shared` 
options carefully.
clone with a history truncated to the specified number of revisions.
See linkgit:git-clone[1]
 
+--no-single-branch::
+   This option is valid for add and update commands. Fetch histories near 
the tips
+   of all branches and create remote-tracking branches in the submodule.
 
 path...::
Paths to submodule(s). When specified this will restrict the command
diff --git a/builtin/clone.c b/builtin/clone.c
index dd4092b..b27917c 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -48,6 +48,7 @@ static int option_verbosity;
 static int option_progress = -1;
 static struct string_list option_config;
 static struct string_list option_reference;
+static struct argv_array argv_submodule_cmd = ARGV_ARRAY_INIT;
 
 static int opt_parse_reference(const struct option *opt, const char *arg, int 
unset)
 {
@@ -100,10 +101,6 @@ static struct option builtin_clone_options[] = {
OPT_END()
 };
 
-static const char *argv_submodule[] = {
-   submodule, update, --init, --recursive, NULL
-};
-
 static char *get_repo_path(const char *repo, int *is_bundle)
 {
static char *suffix[] = { /.git, , .git/.git, .git };
@@ -663,8 +660,14 @@ static int checkout(void)
err |= run_hook_le(NULL, post-checkout, sha1_to_hex(null_sha1

Re: [PATCH/RFC] submodule: add ability to shallowly clone any branch in a submodule

2014-09-11 Thread Cole 
Excerpts from Jens Lehmann's message of 2014-09-11 21:21:04 +0200:
 Am 11.09.2014 um 19:11 schrieb Cole Minnaar:
  Currently when specifying the `--depth` option to the 'submodule add'
  command, it can only create a shallow submodule clone of the currently 
  active
  branch from the cloned repository. If a branch is specified using the
  `--branch` command, the 'submodule add' will result in an error as the
  branch will not exist in the cloned repository. Subsequently, if a
  repository is cloned which contains submodules, and both the `--depth` and
  `--recursive` options are specified, the top level repository will be
  cloned using the specified depth, but each submodule will be cloned in
  its entirety.
 
  Added the ability to shallowly clone any branch as a submodule, not just
  the current active branch from the cloned repository. Also includes the
  ability to shallowly clone a repository and all its submodules.
  Added support to the 'submodule add' and 'submodule update' command to 
  handle
  `--no-single-branch`, which is then passed to the clone command in order
  to setup remote-tracking branches in the shallowly cloned submodules.
 
  Signed-off-by: Cole Minnaar cole.minn...@gmail.com
  ---
 
 Sorry for not having found the time to respond to your first message,
 great to see you started working on this.
 
 While I have no objection to what you are trying to achieve here, I
 think you are doing too much in a single commit. At least the changes
 to git clone (passing --depth and --no-single-branch on to the git
 submodule update when called with --recurse-submodules) and the
 git submodule script should be separated into their own commits.
 
 And from a cursory glance I wonder if git submodule update with
 branch should always imply --no-singe-branch? Then maybe we do not
 need to add this option to the submodule script but simply always
 add it when called with --branch?

Hi Jens,

Thanks for the feedback, really appreciate it, and will try to reformat
the patches as you have asked.

When you say you would like the patches split, do you mean into two
separate threads, or just different patches part of the same thread?

As for --no-single-branch on 'git submodule update', I didn't want to
break existing functionality, but if you would prefer that to be the
default I can make it so.

Also if there is anything else you are currently looking at regarding
submodules or thinking about, I would be glad to hear about it or to try
look at it while I am working on these changes. Or if there is anything
you can think of for me to check with regards to these changes that
would also be appreciated.

I am still quite new to some of the git terms and functionality, 
so please excuse me if I do get anything wrong or do not fully understand.

/Cole
 
Documentation/git-clone.txt |  6 +-
Documentation/git-submodule.txt |  8 ++--
builtin/clone.c | 15 +--
git-submodule.sh| 24 
t/t7400-submodule-basic.sh  | 33 -
5 files changed, 72 insertions(+), 14 deletions(-)
 
  diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
  index 0363d00..5eef11c 100644
  --- a/Documentation/git-clone.txt
  +++ b/Documentation/git-clone.txt
  @@ -178,7 +178,9 @@ objects from the source repository into a pack in the 
  cloned repository.
 
--depth depth::
Create a 'shallow' clone with a history truncated to the
  -specified number of revisions.
  +specified number of revisions. If `--recursive` was also specified,
  +the depth value will be passed to all submodules within when
  +cloning.
 
--[no-]single-branch::
Clone only the history leading to the tip of a single branch,
  @@ -192,6 +194,8 @@ objects from the source repository into a pack in the 
  cloned repository.
initial cloning.  If the HEAD at the remote did not point at any
branch when `--single-branch` clone was made, no remote-tracking
branch is created.
  +If `--recursive` was also specified, this option will also be passed
  +to all submodules when cloning.
 
--recursive::
--recurse-submodules::
  diff --git a/Documentation/git-submodule.txt 
  b/Documentation/git-submodule.txt
  index 8e6af65..176f150 100644
  --- a/Documentation/git-submodule.txt
  +++ b/Documentation/git-submodule.txt
  @@ -10,13 +10,14 @@ SYNOPSIS

[verse]
'git submodule' [--quiet] add [-b branch] [-f|--force] [--name name]
  -  [--reference repository] [--depth depth] [--] repository 
  [path]
  +  [--reference repository] [--depth depth] [--no-single-branch]
  +  [--] repository [path]
'git submodule' [--quiet] status [--cached] [--recursive] [--] [path...]
'git submodule' [--quiet] init [--] [path...]
'git submodule' [--quiet] deinit [-f|--force] [--] path...
'git submodule' [--quiet] update [--init

Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I

2005-04-21 Thread Steven Cole 
On Thursday 21 April 2005 01:11 am, Petr Baudis wrote:
 Dear diary, on Thu, Apr 21, 2005 at 02:20:27AM CEST, I got a letter
 where Steven Cole [EMAIL PROTECTED] told me that...
  Actually, I meant patch -p1 stuff_from_above.
 
 So, how did it end up?

The file listed in the diff was already patched, so applying that
output does the expected:
[EMAIL PROTECTED] git-pasky-0.6.2-damaged]$ patch -p1 xyzzy.diff
patching file gitcancel.sh
Reversed (or previously applied) patch detected!  Assume -R? [n] n
Apply anyway? [n] n
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file gitcancel.sh.rej

 
 Actually, never mind. I forgot that I bring the local changes forward as
 patches instead. So this is Harmless (tm). It means the patch containing
 your local changes has just that kind of git diff output containing
 filename: hash. I will probably just chain grep -v '^[^+-@ ]' in front
 of patch. (Someone starting his filename with a space _deserves_ the
 trouble. ;-)
 
  But before doing that, I did a fsck-cache as follows, with these results.
  This seems damaged.
  
  [EMAIL PROTECTED] git-pasky-0.6.2]$ fsck-cache --unreachable $(cat 
  .git/HEAD)
 
 You can't do just this. In Cogito repository, you may have multiple
 branches, each with different HEAD of course. So you need to
 
   fsck-cache --unreachable $(cat .git/heads/*)
 

[EMAIL PROTECTED] git-pasky-0.6.2]$ fsck-cache  $(cat .git/heads/*)
root 1bf00e46973f7f1c40bc898f1346a1273f0a347f
dangling commit 2c1a8048d56cfbe0ff8a3d04c12d06f3832e7edc
dangling commit a387546d148df5718a9c53bbe0cbea441e793d98
dangling blob d6ff9de73fc920cf1f27afac82571c4c58526b80

[EMAIL PROTECTED] git-pasky-0.6.2]$ ./git-prune-script

Ah, yes. Prune juice.

[EMAIL PROTECTED] git-pasky-0.6.2]$ fsck-cache --unreachable $(cat .git/heads/*)
root 1bf00e46973f7f1c40bc898f1346a1273f0a347f

Now, all is well.  Sorry for the noise.

Steven


-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Errors received during git pull from linux-2.6.git, but resulting kernel looks OK.

2005-04-21 Thread Steven Cole 
Executive summary: I received some alarming errors while doing
a git pull of the latest kernel from kernel.org, but it appears
that all is well.  Continue reading for the gory details.
I updated my git-pasky tools this morning, by doing git pasky pull, make, make 
install.
Working from a repo converted yesterday using Linus'instructions and 
subsequently
successfully updated once:
[EMAIL PROTECTED] linux-2.6-origin]$ git lsremote
origin  rsync://www.kernel.org/pub/linux/kernel/people/torvalds/linux-2.6.git
[EMAIL PROTECTED] linux-2.6-origin]$ time git pull origin
MOTD:
MOTD:   Welcome to the Linux Kernel Archive.
MOTD:
MOTD:   Due to U.S. Exports Regulations, all cryptographic software on this
MOTD:   site is subject to the following legal notice:
MOTD:
MOTD:   This site includes publicly available encryption source code
MOTD:   which, together with object code resulting from the compiling of
MOTD:   publicly available source code, may be exported from the United
MOTD:   States under License Exception TSU pursuant to 15 C.F.R. Section
MOTD:   740.13(e).
MOTD:
MOTD:   This legal notice applies to cryptographic software only.
MOTD:   Please see the Bureau of Industry and Security,
MOTD:   http://www.bis.doc.gov/ for more information about current
MOTD:   U.S. regulations.
MOTD:
receiving file list ... done
18/13b464853cba4439b3c30412059ed6284114a0
8d/a3a306d0c0c070d87048d14a033df02f40a154
a2/755a80f40e5794ddc20e00f781af9d6320fafb
sent 181 bytes  received 952105 bytes  272081.71 bytes/sec
total size is 63450766  speedup is 66.63
receiving file list ... done
client: nothing to do: perhaps you need to specify some filenames or the 
--recursive option?
Tree change: 
4d78b6c78ae6d87e4c1c8072f42efa716f04afb9:a2755a80f40e5794ddc20e00f781af9d6320fafb
*100644-100644 blob
8e5f9bbdf4de94a1bc4b4da8cb06677ce0a57716-8da3a306d0c0c070d87048d14a033df02f40a154 
Makefile
Tracked branch, applying changes...
Fast-forwarding 4d78b6c78ae6d87e4c1c8072f42efa716f04afb9 - 
a2755a80f40e5794ddc20e00f781af9d6320fafb
on top of 4d78b6c78ae6d87e4c1c8072f42efa716f04afb9...
error: bad index version
error: verify header failed
read_cache: Invalid argument
gitdiff.sh: no files matched
error: bad index version
error: verify header failed
real6m4.771s
user0m16.538s
sys 0m12.952s
[EMAIL PROTECTED] linux-2.6-origin]$
Maybe those errors are harmless.  Checking out the new repo:
[EMAIL PROTECTED] linux-2.6-origin]$ git export ../linux-2.6.12-rc3
[EMAIL PROTECTED] linux-2.6-origin]$ cd ..
[EMAIL PROTECTED] GIT]$ diff -urN linux-2.6.11 linux-2.6.12-rc3 
gitdiff-2.6.12-rc3
So, now I have patch-2.6.12-rc3 from kernel.org and gitdiff-2.6.12-rc3 made 
above.
[EMAIL PROTECTED] GIT]$ diffstat gitdiff-2.6.12-rc3 | tail -n 2
 sound/usb/usx2y/usbusx2yaudio.c  |1
 4622 files changed, 271839 insertions(+), 156792 deletions(-)
[EMAIL PROTECTED] GIT]$ diffstat patch-2.6.12-rc3 | tail -n 2
 sound/usb/usx2y/usbusx2yaudio.c  |1
 4622 files changed, 271839 insertions(+), 156792 deletions(-)
Despite the errors from the git pull, the files look OK.
Steven
-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Colorized git log

2005-04-21 Thread Steven Cole 
On Thursday 21 April 2005 06:54 pm, Petr Baudis wrote:

 Duh. And they say Where possible terminfo is consulted to find the
 string to use. in their manual page. :/
 
  gitlog.sh: 6d24d857fb6c2f7e810954adaca1990599906f07
  --- a/gitlog.sh
  +++ b/gitlog.sh
  @@ -11,11 +11,11 @@
   
   if [ $1 = -c ]; then
  shift
  -   colheader=$(setterm -foreground green)
  -   colauthor=$(setterm -foreground cyan)
  -   colcommitter=$(setterm -foreground magenta)
  -   colsignoff=$(setterm -foreground yellow)
  -   coldefault=$(setterm -foreground default)
  +   colheader=$(tput setaf 2)
  +   colauthor=$(tput setaf 6)
  +   colcommitter=$(tput setaf 5)
  +   colsignoff=$(tput setaf 3)
  +   coldefault=$(tput op)
   else
  colheader=
  colauthor=
 
 Please at least stick the colors in comments after the assignment.
 Not everyone knows ANSI color codes off-hand (the last thing I've
 memorized were BIOS color codes in the distant DOS days).
 

I like the color idea, but since many people have their own idea
of what colors are appropriate, etc (I use a dark background, and
the magenta is painful), perhaps we could have a LOG_COLORS
file, similar in concept (but more readable) to the /etc/DIR_COLORS
file.  Great work !

Steven
-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [ANNOUNCE] git-pasky-0.6.3 request for testing

2005-04-21 Thread Steven Cole 
On Thursday 21 April 2005 09:09 pm, Petr Baudis wrote:
   Hello,
 
   FYI, I've released git-pasky-0.6.3 earlier in the night. It brings
 especially plenty of bugfixes, but also some tiny enhancements, like
 colored log and ability to pick branch in the remote repository. git log
 and git patch now also accept range of commits, so e.g. if you do

Here's a patch to let people know about the nice color feature.

Signed-off-by: Steven Cole [EMAIL PROTECTED]

Index: git
===
--- 0a9ee5a4d947b998a7ce489242800b39f985/git  (mode:100755 
sha1:39969debd59ed51c57973c819cdcc3ca8a7da819)
+++ uncommitted/git  (mode:100755)
@@ -35,7 +35,7 @@
forkBNAME BRANCH_DIR [COMMIT_ID]
help
initRSYNC_URL
-   log [COMMIT_ID | COMMIT_ID:COMMIT_ID]
+   log [-c] [COMMIT_ID | COMMIT_ID:COMMIT_ID]
ls  [TREE_ID]
lsobj   [OBJTYPE]
lsremote
Index: gitlog.sh
===
--- 0a9ee5a4d947b998a7ce489242800b39f985/gitlog.sh  (mode:100755 
sha1:50eab642cdf5e695cf15be4ce3a7469dd68637e7)
+++ uncommitted/gitlog.sh  (mode:100755)
@@ -7,6 +7,14 @@
 # Major optimizations by (c) Phillip Lougher.
 # Rendered trivial by Linus Torvalds.
 #
+# Takes a -c option to add color to the output.
+# Currently, the colors are:
+#
+#  header  Green   
+#  author  Cyan
+#  committer   Magenta
+#  signoff Yellow
+#
 # Takes an id resolving to a commit to start from (HEAD by default),
 # or id1:id2 representing an (id1;id2] range of commits to show.
 
-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [ANNOUNCE] git-pasky-0.6.2 heads-up on upcoming changes

2005-04-20 Thread Steven Cole 
Randy.Dunlap wrote:
On Wed, 20 Apr 2005 23:51:18 +0200 Petr Baudis wrote:
| Dear diary, on Wed, Apr 20, 2005 at 11:19:19PM CEST, I got a letter
| where Greg KH [EMAIL PROTECTED] told me that...
|  On Wed, Apr 20, 2005 at 10:56:33PM +0200, Petr Baudis wrote:
| The short command version will change from 'git' to 'cg', which should
|   be shorter to type and free the 'git' command for possible eventual
|   entry gate for the git commands (so that they are more
|   namespace-friendly, and it might make most sense anyway if we get fully
|   libgitized; but this is more of long-term ideas).
|  
|  Hm, but there already is a 'cg' program out there:
|  	http://uzix.org/cgvg.html
|  I use it every day :(
|  
|  How about 'cog' instead?
| 
| Grm. Cg is also name of some scary NVidia thing, and cog is GNOME
| Configurator. CGT are Chimera Grid Tools, but I think we can clash
| with those - at least *I* wouldn't mind. ;-)

I'd rather see you go back to 'tig'...
is there a tig out there?
---
~Randy
Since I was the one who came up with the cogito name, I'll suggest
some alternatives if cogito is unworkable.  This was posted once before,
mostly as a joke, but here goes.
agitato  ag Since Beethoven's Moonlight 3rd mvmt is Presto agitato
and very, very fast, just like git.
legit le or lg  Since git is GPLv2, it's now legit.
Steven
-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I

2005-04-20 Thread Steven Cole 
After getting the latest tarball, and make, make install:

[EMAIL PROTECTED] git-pasky-0.6.2]$ git pull pasky
MOTD:  Welcome to Petr Baudis' rsync archive.
MOTD:
MOTD:  If you are pulling my git branch, please do not repeat that
MOTD:  every five minutes or so - new stuff is likely not going to
MOTD:  appear so fast, and my line is not that thick. Nothing wrong
MOTD:  with pulling every half an hour or so, of course.
MOTD:
MOTD:  Feel free to contact me at [EMAIL PROTECTED], shall you have
MOTD:  any questions or suggestions.


receiving file list ... done
2e/1f16579fdcd9cd5d242f53a3cfaad52ac5d207
3e/f49665799151ced5e03ae1d544b1d67a6b7e5b
74/b4083d67eda87d88a6f92c6c66877bba8bda8a
7f/621eae988378ee776c040a5856e873e41691e1
a2/44b27ac61489b7d7fa4246e82479897d3bb886
a3/87546d148df5718a9c53bbe0cbea441e793d98
a4/6844fcb6afef1f7a2d93f391c82f08ea31
a6/7b79e97f9db01bc270a07f3be9cda610845128
ba/4c6268d14989801b15e87cab98f6a236cc5e7f
f9/3b5e3d8a427d93e7e5125b55b17cd1a9479af9

wrote 228 bytes  read 6 bytes  6466.06 bytes/sec
total size is 1753925  speedup is 17.50

receiving file list ... done

wrote 62 bytes  read 633 bytes  198.57 bytes/sec
total size is 369  speedup is 0.53
Tree change: 
55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea31
*100755-100755 blob
a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67-74b4083d67eda87d88a6f92c6c66877bba8bda8a
 gitcancel.sh
Tracked branch, applying changes...
Fast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 - 
a46844fcb6afef1f7a2d93f391c82f08ea31
on top of 55f9d5042603fff4ddfaf4e5f004d2995286d6d3...
patch:  Only garbage was found in the patch input.

This may be a harmless message, but I thought I'd bring it to your attention.

Steven
-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I

2005-04-20 Thread Steven Cole 
On Wednesday 20 April 2005 05:15 pm, Steven Cole wrote:
 On Wednesday 20 April 2005 05:12 pm, Petr Baudis wrote:
  Dear diary, on Thu, Apr 21, 2005 at 01:06:09AM CEST, I got a letter
  where Steven Cole [EMAIL PROTECTED] told me that...
   After getting the latest tarball, and make, make install:
   
   Tree change: 
   55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea31
   *100755-100755 blob
   a78cf8ccab98861ef7aecb4cb5a79e47d3a84b67-74b4083d67eda87d88a6f92c6c66877bba8bda8a
gitcancel.sh
   Tracked branch, applying changes...
   Fast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 - 
   a46844fcb6afef1f7a2d93f391c82f08ea31
   on top of 55f9d5042603fff4ddfaf4e5f004d2995286d6d3...
   patch:  Only garbage was found in the patch input.
   
   This may be a harmless message, but I thought I'd bring it to your 
   attention.
  
  This _is_ weird. What does
  
  $ git diff -r 
  55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea3
  
  tell you? 
 
 [EMAIL PROTECTED] git-pasky-0.6.2]$ git diff -r 
 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea3
 Index: gitcancel.sh
[ output snipped, see previous message for output]
 
  What if you feed it to patch -p1? 
 I haven't done that yet, awaiting response to above.
 
  What if you feed it to git  
  apply?
  
  Thanks,
  
 Your're welcome.  I'll do the git patch -p1 stuff_from_above if that's 
 what's needed,
 same with git apply.  Corrrections to syntax apprceciated.
 Steven

Actually, I meant patch -p1 stuff_from_above.

But before doing that, I did a fsck-cache as follows, with these results.
This seems damaged.

[EMAIL PROTECTED] git-pasky-0.6.2]$ fsck-cache --unreachable $(cat .git/HEAD)
root 1bf00e46973f7f1c40bc898f1346a1273f0a347f
unreachable commit 0128396de7ca8a7dc74f6fbff59a68bb781bb9b2
unreachable blob 012c82312c99606f914bda5c501b616237a3b7e9
unreachable tree 02a1b5337f78b807d4404f473e55c44f4273d2f8

[ lots of snippage...]

unreachable blob fee26cc5b378819ff48ef8cb54c35744c0f1c17f
unreachable tree fff7294434014ea68153770da3965ed315806499

[EMAIL PROTECTED] git-pasky-0.6.2]$ fsck-cache --unreachable $(cat .git/HEAD) | 
wc -l
467

I renamed the repo to git-pasky-0.6.2-damaged, and repeated untarring the 0.6.2 
tarball,
make, (didn't do make install this time), and repeated git pull pasky with
similar results as before.

[EMAIL PROTECTED] git-pasky-0.6.2-damaged]$ cat .git/HEAD
a46844fcb6afef1f7a2d93f391c82f08ea31
[EMAIL PROTECTED] git-pasky-0.6.2-damaged]$ cd ../git-pasky-0.6.2
[EMAIL PROTECTED] git-pasky-0.6.2]$ cat .git/HEAD
7a4c67965de68ae7bc7aa1fde33f8eb9d8114697

Hope this helps,
Steven

-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Steven Cole 
Linus Torvalds wrote:
On Tue, 19 Apr 2005, Greg KH wrote:
Nice, it looks like the merge of this tree, and my usb tree worked just
fine.

Yup, it all seems to work out.
[many files patched]
patching file mm/mmap.c
patching file net/bridge/br_sysfs_if.c
patching file scripts/ver_linux
--^
Hey, that's my patch!  Last...and least.
But perhaps a progress bar right about here might be
a good thing for the terminally impatient.
real3m54.909s
user0m14.835s
sys 0m10.587s
4 minutes might be long enough to cause some folks to lose hope.
Steven
-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Steven Cole 
On Tuesday 19 April 2005 04:38 pm, Linus Torvalds wrote:
 
 On Tue, 19 Apr 2005, Steven Cole wrote:
 
  But perhaps a progress bar right about here might be
  a good thing for the terminally impatient.
  
  real3m54.909s
  user0m14.835s
  sys 0m10.587s
  
  4 minutes might be long enough to cause some folks to lose hope.
 
 Well, the real operations took only 15 seconds. What kind of horribe 
 person are you, that you don't have all of the kernel in your disk cache 
 already? Shame on you.
 
 Or was the 4 minutes for downloading all the objest too?

Yes, I was using a very recent version of the pasky tools,
I had created the repo this morning with git init YOUR_RSYC_URL_FOR_LINUX-2.6.
I did time git pull origin and watched the fur fly.

Then, the flurry of patching file blah messages, followed by a rather 
pregnant pause after the last patching message.

I wasn't complaining about the 4 minutes, just the lack of feedback
during the majority of that time.  And most of it was after the last
patching file message.

 
 Anyway, it looks like you are using pasky's scripts, and the old 
 patch-based upgrade at that. You certainly will _not_ see the
 
   [many files patched]
   patching file mm/mmap.c
   ..
 
 if you use a real git merge. That's probable be the real problem here.
 
 Real merges have no patches taking place _anywhere_. And they take about 
 half a second. Doing an update of your tree should _literally_ boil down 
 to
 
   #
   # repo needs to point to the repo we update from
   #
   rsync -avz --ignore-existing $repo/objects/. .git/objects/.
   rsync -L $repo/HEAD .git/NEW_HEAD || exit 1
   read-tree -m $(cat .git/NEW_HEAD) || exit 1
   checkout-cache -f -a
   update-cache --refresh
   mv .git/NEW_HEAD .git/HEAD
 
 and if it does anything else, it's literally broken. Btw, the above does
 need my read-tree -m thing which I committed today.
 
 (CAREFUL: the above is not a good script, because it _will_ just overwrite 
 all your old contents with the stuff you updated to. You should thus not 
 actually use something like this, but a git update should literally end 
 up doing the above operations in the end, and just add proper checking).
 
 And if that takes 4 minutes, you've got problems.
 
 Just say no to patches. 
 
   Linus
 
 PS: If you want a clean tree without any old files or anything else, for
 that matter, you can then do a show-files -z --others | xargs -0 rm, but
 be careful: that will blow away _anything_ that wasn't revision controlled
 with git. So don't blame me if your pr0n collection is gone afterwards.
 

OK.  I may try some of this tomorrow from work, where I have a fat pipe.

I'm on dialup from home, and I suspect not very many folks want to hear
the sad tale of how long it takes to get the kernel over 56k dialup.

Steven
-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Add help details to git help command.

2005-04-18 Thread Steven Cole 
Petr Baudis wrote:
Dear diary, on Mon, Apr 18, 2005 at 06:42:26AM CEST, I got a letter
where Steven Cole [EMAIL PROTECTED] told me that...
[snippage]

This patch will provide the comment lines in the shell script associated
with the command, cleaned up a bit for presentation.
BUGS: This will also print any comments in the entire file, which may
not be desired.  If a command name and shell script filename
do not follow the usual convention, this won't work, e.g. ci for commit.

Hey, those BUGS are the only slightly non-trivial thing on the whole
thing! I could do this patch myself... ;-) Also, you don't want to print
the first newline and the Copyright notices.
Fixed extra vertical whitespace, Copyright notice problems, and issue
with git help ci.
Here's a better version.  Didn't fix the more interesting bugs, as I'm
pressed for time (aren't we all).  Perhaps someone can polish this up.
Anyway, I think it's pretty useful in its present form.
Thanks,
Steven
-
This patch will provide the comment lines in the shell script associated
with the command, cleaned up a bit for presentation.
BUGS: This will also print any comments in the entire file, which may
not be desired.  If a command name and shell script filename
do not follow the usual convention, this won't work.
git: b648169640025bd68d1b27a0fcc85b65d85e4440
--- git
+++ git 2005-04-18 10:34:17.0 -0600
@@ -19,6 +19,11 @@
 help () {
+
+command=$1
+scriptfile=git$command.sh
+
+if [ ! $command ]; then
cat __END__
 The GIT scripted toolkit  $(gitversion.sh)
@@ -48,7 +53,10 @@
track   [RNAME]
version
+Additional help is available with: git help COMMAND
+
 Note that these expressions can be used interchangably as IDs:
+
empty string (current HEAD)
local (the local branch if tracking a remote one)
remote name (as registered with git addremote)
@@ -57,6 +65,14 @@
commit object hash (as returned by commit-id)
tree object hash (accepted only by some commands)
 __END__
+fi
+if [ $scriptfile = gitci.sh ]; then
+   scriptfile=gitcommit.sh
+fi
+if [ ! $scriptfile = git.sh ]; then
+   grep ^# $scriptfile | grep -v !/bin | grep -v (c) \
+   | cut -c 2- | grep ^.
+fi
 }

-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Add lsremote command.

2005-04-17 Thread Steven Cole 
On Sunday 17 April 2005 08:03 am, Petr Baudis wrote:
 Dear diary, on Sun, Apr 17, 2005 at 07:36:51AM CEST, I got a letter
 where Steven Cole [EMAIL PROTECTED] told me that...
  This is a fairly trivial addition, but if users are adding remote 
  repositories
  with git addremote, then those users should be able to list out the remote
  list without having to know the details of where the remotes file is kept.
 
 Could you please send your patches inline? (Either in the body or with
 correct content-disposition header.)
 
 You got the return values other way around and you are missing a
 copyright notice at the top; you should also mention that you take no
 parameters.
 
 Please use -s instead of -e, since it is more appropriate in this case.
 Also, you should report the no remotes message to stderr. And always
 exit when you found that .git/remotes exists, not only if cat succeeds.
 
 Kind regards,
 
Thanks for the fixes.  Here's a better version.
Steven

 This is a fairly trivial addition, but if users are adding remote repositories
 with git addremote, then those users should be able to list out the remote
 list without having to know the details of where the remotes file is kept.

Signed-off-by: Steven Cole [EMAIL PROTECTED]

diff -urN git-pasky.orig/git git-pasky/git
--- git-pasky.orig/git  2005-04-17 15:02:37.0 -0600
+++ git-pasky/git   2005-04-17 15:04:23.0 -0600
@@ -41,6 +41,7 @@
log
ls  [TREE_ID]
lsobj   [OBJTYPE]
+   lsremote
merge   -b BASE_ID FROM_ID
pull[RNAME]
rm  FILE...
@@ -105,6 +106,7 @@
 log)gitlog.sh $@;;
 ls) gitls.sh $@;;
 lsobj)  gitlsobj.sh $@;;
+lsremote)   gitlsremote.sh $@;;
 merge)  gitmerge.sh $@;;
 pull)   gitpull.sh $@;;
 rm) gitrm.sh $@;;
diff -urN git-pasky.orig/gitlsremote.sh git-pasky/gitlsremote.sh
--- git-pasky.orig/gitlsremote.sh   1969-12-31 17:00:00.0 -0700
+++ git-pasky/gitlsremote.sh2005-04-17 16:20:48.0 -0600
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# Lists remote GIT repositories
+# Copyright (c) Steven Cole 2005
+#
+# Takes no parameters
+#
+[ -s .git/remotes ]  cat .git/remotes
+[ -s .git/remotes ]  exit
+
+echo List of remotes is empty. See git addremote. 2

-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] Add lsremote command.

2005-04-16 Thread Steven Cole 
This is a fairly trivial addition, but if users are adding remote repositories
with git addremote, then those users should be able to list out the remote
list without having to know the details of where the remotes file is kept.

Steven

Adds lsremote command to list remotes.

Signed-Off-By: Steven Cole [EMAIL PROTECTED]

-

diff -urN git-pasky-orig/git git-pasky/git
--- git-pasky-orig/git	2005-04-16 22:47:22.0 -0600
+++ git-pasky/git	2005-04-16 22:49:14.0 -0600
@@ -41,6 +41,7 @@
 	log
 	ls		[TREE_ID]
 	lsobj		[OBJTYPE]
+	lsremote
 	merge		-b BASE_ID FROM_ID
 	pull		[RNAME]
 	rm		FILE...
@@ -105,6 +106,7 @@
 log)gitlog.sh $@;;
 ls) gitls.sh $@;;
 lsobj)  gitlsobj.sh $@;;
+lsremote)   gitlsremote.sh $@;;
 merge)  gitmerge.sh $@;;
 pull)   gitpull.sh $@;;
 rm) gitrm.sh $@;;
diff -urN git-pasky-orig/gitlsremote.sh git-pasky/gitlsremote.sh
--- git-pasky-orig/gitlsremote.sh	1969-12-31 17:00:00.0 -0700
+++ git-pasky/gitlsremote.sh	2005-04-16 22:58:15.0 -0600
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# ls remotes in GIT repository
+#
+[ -e .git/remotes ]  cat .git/remotes  exit 1
+
+echo 'List of remotes is empty. See git addremote.'