Junio C Hamano wrote:
Because the implementation is too ugly.
I know :) The only reason I sent it with code is because I didn't get
any responses to an email without code. If you agree that it is a
useful feature, we have to figure out a beautiful implementation.
I would however can imagine
Junio C Hamano wrote:
Good, but a style only patch like this should consider taking
advantage of the occasion to clean up the entire file, as we do not
often get enough chance to do so without conflicting with in-flight
topics. Is there something else that would conflict if this step
did so?
Junio C Hamano wrote:
Is there a reason why quux is better than another randomly chosen
string $(pwd)/one?
$(pwd)/one is not randomly chosen: that configuration will work with
push/pull, and is therefore misleading. I put in a deliberately bogus
value because I wanted to make it clear that
Junio C Hamano wrote:
That may be a good thing in principle, but I _think_
[...]
sequence is used so that we do not even have to worry about what
leftover configuration values are in the testrepo/.git/config; so
does it really matter?
Yeah, you're right. Dropped.
--
To unsubscribe from this
Junio C Hamano wrote:
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index fd0a81e..93e11c8 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -702,27 +702,42 @@ test_expect_success 'migrate a remote from named file
in $GIT_DIR/branches' '
)
'
-test_expect_success
Junio C Hamano wrote:
As far as I can tell, that valid-remote-nick was done in df93e33c
(Validate nicknames of remote branches to prohibit confusing ones,
2008-02-15), and back in that version, the codepath and the feature
that wants to see a slash and do magical things, which is described
by
Eric Sunshine wrote:
Broken -chain.
Good eyes, thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi,
Since I didn't explain the series properly last time: this series
reduces the burden of the branches-file/remotes-file cruft. It does
not argue for deprecation, because it is still useful to some people
and harms nobody. It removes dead code, tests the feature properly,
and doesn't mention
Explain that they are fringe features.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
remote.c | 8
1 file changed, 8 insertions(+)
diff --git a/remote.c b/remote.c
index 128b210..f980928 100644
--- a/remote.c
+++ b/remote.c
@@ -227,6 +227,10 @@ static void
One outdated example encourages the use of $GIT_DIR/branches files.
Replace it with an equivalent example using a remote.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/git-ls-remote.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
Modernize the style of all tests throughout the file:
- Remove spurious blank lines.
- Indent the test body.
- Make sure that all lines end with , to make it easier to spot breaks
in the chain.
- When executing something in a subshell, put the parenthesis on
separate lines and indent the body.
Four tests exercising fetch and push functionality unnecessarily depend
on $GIT_DIR/branches files. Modern Git does not encourage the use of
those files, and the parser remote.c:read_branches_file() is only
provided for backward compatibility with older repositories. We already
have tests in
Replace it with the equivalent gitconfig configuration, using the
results of the corresponding tests in t/t5505-remote.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5515-fetch-merge-logic.sh | 28 +---
1 file changed, 13 insertions(+), 15 deletions(-)
Add one more test similar to migrate a remote from named file in
$GIT_DIR/branches to check that a url with a # can be used to specify
the branch name (as opposed to the constant master).
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5505-remote.sh | 22 ++
1
The first line of the function checks that the remote-name contains a
slash ('/'), and sets the slash variable accordingly. The only caller
of read_branches_file() is remote_get_1(); the calling codepath is
guarded by valid_remote_nick(), which checks that the remote does not
contain a slash.
Replace instances of ! test -f with test_path_is_missing.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5505-remote.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 74ddd77..d688662 100755
---
In the tests migrate a remote from named file in
$GIT_DIR/{remotes,branches}, we are only checking that a configuration
is migrated successfully; it has no correspondence with whether or not
those values do something sensible with other git
operations (fetch/push). Therefore, there is no need to
Extend the test migrate a remote from named file in $GIT_DIR/remotes
to test that multiple Push: and Pull: lines in the remotes-file
works as expected.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5505-remote.sh | 16 ++--
1 file changed, 14 insertions(+), 2
Replace the repository paragraph containing specific references to
$GIT_DIR/branches and . with a generic urls-or-remotes paragraph
referencing the relevant sections in the git-fetch(1) manpage.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/git-ls-remote.txt | 6 +++---
Replace it with the equivalent gitconfig configuration, using the
results of a test in t/t5505-remote.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5510-fetch.sh | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
Under the EXAMPLES section, there is one invocation on the git.git
repository that attempts to list the refs master, pu, and rc. The ref
rc does not exist in today's repository, so remove it. Among other
things, this example demonstrates that the refs... argument is
simply a filter; requesting a
The test migrate a remote from named file in $GIT_DIR/branches reads
the branches-file, but only checks that the url and fetch-refspec are
set correctly. Check that the push-refspec is also set correctly.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5505-remote.sh | 3 ++-
1
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index fd9a1d5..43c6226 100644
---
On Fri, Jun 21, 2013 at 1:11 PM, Junio C Hamano gits...@pobox.com wrote:
John Szakmeister j...@szakmeister.net writes:
[snip]
I can see where this is confusing, but can also see how it's useful
information to have. On clone, it's probably not that useful since
you're looking right at the url,
Am 22.06.2013 00:32, schrieb Junio C Hamano:
Ramkumar Ramachandra artag...@gmail.com writes:
Replace the 'git config' calls in tests with test_config for greater
robustness.
That may be a good thing in principle, but I _think_
mk_empty testrepo
(
cd
On Fri, Jun 21, 2013 at 02:21:47AM -0700, Dave Abrahams wrote:
The docs for fast-import seem to imply that I can use ls to get the
SHA1 of a commit for which I have a mark:
Reading from a named tree
The dataref can be a mark reference (:idnum) or the full
40-byte
Signed-off-by: John Keeping j...@keeping.me.uk
---
contrib/completion/git-completion.bash | 2 ++
t/t9902-completion.sh | 1 +
2 files changed, 3 insertions(+)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 8fbf941..c3290af
git-completion.bash's parsing of the command name relies on everything
preceding it starting with '-' unless it is the -c option. This
allows users to use the stuck form of --work-tree=path and
--namespace=path but not the unstuck forms --work-tree path and
--namespace path. Fix this.
Corresponding to woman.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/git-help.txt | 3 +++
builtin/help.c | 11 ---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
contrib/completion/git-completion.bash | 4
1 file changed, 4 insertions(+)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 6c3bafe..b51c9e3 100644
---
On Sat, Jun 22, 2013 at 05:13:29PM +0530, Ramkumar Ramachandra wrote:
Corresponding to woman.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/git-help.txt | 3 +++
builtin/help.c | 11 ---
2 files changed, 11 insertions(+), 3 deletions(-)
John Keeping wrote:
Would it be nicer to pass a string in here instead of a flag? Then this
becomes:
strbuf_addf(man_page, (%s \%s\), command, page);
You should probably also rename this function to exec_emacsclient or
something as well now that it doesn't just launch woman.
Sure,
Hi,
On Sat, Jun 22, 2013 at 12:25:17PM +0100, John Keeping wrote:
git-completion.bash's parsing of the command name relies on everything
preceding it starting with '-' unless it is the -c option. This
allows users to use the stuck form of --work-tree=path and
--namespace=path but not the
On Sat, Jun 22, 2013 at 02:30:33PM +0200, SZEDER Gábor wrote:
Hi,
On Sat, Jun 22, 2013 at 12:25:17PM +0100, John Keeping wrote:
git-completion.bash's parsing of the command name relies on everything
preceding it starting with '-' unless it is the -c option. This
allows users to use the
On Tue, Jun 18, 2013 at 09:55:22PM -0400, W. Trevor King wrote:
They've grown since d19fbc3 (Documentation: add git user's manual,
2007-01-07) when the stats were initially added. I've rounded
download sizes up to the nearest power of ten MiB to decrease the
precision and give a bit of
Hi,
On Thu, Jun 20, 2013 at 11:25:26PM -0300, Eduardo R. D'Avila wrote:
git-prompt.sh lacks tests for PROMPT_COMMAND mode.
Add tests for:
* pcmode prompt without colors
* pcmode prompt with colors for bash
* pcmode prompt with colors for zsh
Having these tests enables an upcoming
On Thu, Jun 20, 2013 at 11:25:28PM -0300, Eduardo R. D'Avila wrote:
Do not print a duplicate clean color code when there
is no other indicators other than the current branch
in colored prompt.
Signed-off-by: Eduardo R. D'Avila erdav...@gmail.com
Great. I wanted to point out in the previous
On Thu, Jun 20, 2013 at 11:25:29PM -0300, Eduardo R. D'Avila wrote:
Mention that the command below is needed for prompt
in ZSH with PS1:
setopt PROMPT_SUBST
Make it clear that colored prompt is only available
in PROMPT_COMMAND mode.
Signed-off-by: Eduardo R. D'Avila erdav...@gmail.com
Eduardo R. D'Avila erdavila at gmail.com writes:
+ local c_red='\[\e[31m\]'
+ local c_green='\[\e[32m\]'
+ local c_lblue='\[\e[1;34m\]'
+ local c_clear='\[\e[0m\]'
fi
- local c_red='\e[31m'
- local c_green='\e[32m'
- local
From: W. Trevor King wk...@tremily.us
There are other examples in git-clone.txt demonstrating both '--bare'
and '-l -s'.
Signed-off-by: W. Trevor King wk...@tremily.us
---
Documentation/git-clone.txt | 7 ---
1 file changed, 7 deletions(-)
diff --git a/Documentation/git-clone.txt
From: W. Trevor King wk...@tremily.us
There may be times when using one of your local repositories as a
reference for a new clone make sense, but the implied version-bump in
the old example isn't one of them. I think a more intuitive example
is multi-user system with a central reference clone,
From: W. Trevor King wk...@tremily.us
linux-nfs.org seems to have restructured their repository layout since
8391c60 (git-remote.txt: fix example url, 2007-11-02), and Bruce's
repo is now at git://git.linux-nfs.org/projects/bfields/linux.git.
Bruce also has a more richer internal branch structure
From: W. Trevor King wk...@tremily.us
The 3.x tree has been out for a while now. The -2.6 repository name
survived the initial release [1], but kernel.org now only lists
'linux.git' (for aegl as well as torvalds) [2].
[1]: http://article.gmane.org/gmane.linux.kernel/1147422
On 2011-05-30
From: W. Trevor King wk...@tremily.us
David and Junio mentioned that I'd missed a few 2.6 references in my
initial pass. Here's a second attempt that does some deeper reworking
of the effected sections. Each deeper rewrite gets its own patch and
motivation, with the final patch making all the
2013/6/22 SZEDER Gábor sze...@ira.uka.de:
On Thu, Jun 20, 2013 at 11:25:26PM -0300, Eduardo R. D'Avila wrote:
git-prompt.sh lacks tests for PROMPT_COMMAND mode.
Add tests for:
* pcmode prompt without colors
* pcmode prompt with colors for bash
* pcmode prompt with colors for zsh
Having
2013/6/22 Øystein Walle oys...@gmail.com:
I've gotten the impression it's better to use tput to generate the escape
sequences instead of hardcoding them. So something like:
local c_red='\['$(tput setaf 1)'\]'
local c_green='\['$(tput setaf 2)'\]'
local c_green='\['$(tput setaf 4)'\]'
local
Some people run inetds that collect stderr of the spawned programs.
Give them 'git-daemon --inetd --no-syslog' to keep error output
on stderr.
Signed-off-by: Andreas Krey a.k...@gmx.de
---
Documentation/git-daemon.txt | 4
daemon.c | 14 +++---
2 files changed,
I am using a script that runs as post-checkout and post-merge hook to ensure
some permissions on the working copy files.
Neither of these hooks is run on git reset, so after a git reset --hard the
permissions are lost because apparently the files were created freshly. I
guess I would have
Ramkumar Ramachandra artag...@gmail.com writes:
Junio C Hamano wrote:
Is there a reason why quux is better than another randomly chosen
string $(pwd)/one?
$(pwd)/one is not randomly chosen: that configuration will work with
push/pull, and is therefore misleading.
But isn't the URL: field
I'm having trouble pulling changes from a repo that was imported as a
subtree with 'git subtree add'. The issue occurs when I have
previously used 'git subtree push' from within the project directory,
then pushed changes to the remote repo again from somewhere else (from
another project also using
on Sat Jun 22 2013, John Keeping john-AT-keeping.me.uk wrote:
On Fri, Jun 21, 2013 at 02:21:47AM -0700, Dave Abrahams wrote:
The docs for fast-import seem to imply that I can use ls to get the
SHA1 of a commit for which I have a mark:
Reading from a named tree
The
51 matches
Mail list logo
