I've been getting a couple of test failures and finally had the time to track
them down.
t4034-diff-words fails tests 22 diff driver 'bibtex' and 26 diff driver
'html'. Bisecting shows that the file started giving me errors in commit
8d96e72 t4034: bulk verify builtin word regex sanity, which
Adding __git_ps1() to one's bash prompt displays various repo status
info after each command. After committing a git cherry-pick -n using
git-gui, the prompt still contains the |CHERRY-PICKING flag.
Delete the file causing this flag when cleaning up.
Signed-off-by: Beat Bolli bbo...@ewanet.ch
No po update needed, as this string is untranslated.
Signed-off-by: Beat Bolli bbo...@ewanet.ch
---
git-gui/lib/commit.tcl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 0d81432..78c5eeb 100644
---
A while ago I reported a problem[1] where having:
/somewhere/foo
and
/somewhere/foo.git
as bare repositories and trying to clone them using alternates could
cause git to confuse them.
The conclusion was that I needed to do:
git clone -s -n /somewhere/foo/ x
to stop it looking at the .git
Junio C Hamano gitster at pobox.com writes:
Jiang Xin worldhello.net at gmail.com writes:
Run command 'git rev-parse --git-dir' under subdir will return realpath
of '.git' directory. Some test scripts compare this realpath against
$TRASH_DIRECTORY, they are not equal if current working
On Sat, 2012-08-18 at 15:25 +0100, Richard Purdie wrote:
A while ago I reported a problem[1] where having:
/somewhere/foo
and
/somewhere/foo.git
as bare repositories and trying to clone them using alternates could
cause git to confuse them.
The conclusion was that I needed to do:
From: Michael Haggerty mhag...@alum.mit.edu
On 08/17/2012 01:29 AM, Junio C Hamano wrote: Junio C Hamano
gits...@pobox.com writes:
I like the general direction. Perhaps a long distant future
direction could be to also use the same trick in the ref namespace
so that we can have 'next' branch
From: Michael Haggerty mhag...@alum.mit.edu
This is just something I stumbled across.
Michael Haggerty (2):
git-config.txt: properly escape quotation marks in example
git-config.txt: fix example
Documentation/git-config.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
From: Michael Haggerty mhag...@alum.mit.edu
In the example line as written,
gitproxy=proxy-command for kernel.org
the quotation marks are eaten by the config-file parser. From the
history, it looks like this example wanted to have quotation marks in
the actual configured value. So
This is sort of an RFC/ANN. There has been a whole bunch of traffic of
late on git-svn, vcs-svn, the remote helper, etc. I would like to
present an alternate solution that I've been playing with for a couple
of weeks.
I work in a team that uses a mixture of git-svn and svn proper. Whilst
it works
From: James R. McKaskill ja...@foobar.co.nz
Signed-off-by: James R. McKaskill ja...@foobar.co.nz
---
t/lib-git-svn-fetch.sh | 131 +++
t/t9050-git-svn-fetch.sh| 85 +++
t/t9051-git-svn-fetch-branch.sh | 245
t/t9052-git-svn-push.sh |
From: Michael Haggerty mhag...@alum.mit.edu
The --add option is required to add a new value to a multivalued
configuration entry.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/git-config.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
On Friday 17 August 2012 21:16:59 Junio C Hamano wrote:
Comments from mentors and people interested in remote helpers?
I did minimum line wrapping, typofix and small compilation fixes
and queued these on 'pu'; I think I saw one commit whose message
I didn't quite get what it was trying to
On Sat, Aug 18, 2012 at 6:40 AM, Florian Achleitner
florian.achleitner.2.6...@gmail.com wrote:
Hi!
This patch series should prepare vcs-svn/svndump.* for branch
detection. When starting with this feature I found that the existing
functions are not yet appropriate for that.
These rewrites the
I've already posted it to SO [1], but got no satisfactory answer. The command
git diff mycommit
compares the working tree against mycommit, so it should not depend on the
index. But it does as this example shows:
git init
echo A A.txt; git add .; git commit -m A; git branch A
echo B B.txt;
On 08/11/2012 10:14 AM, Steven Walter wrote:
This fixes a bug where git finds the incorrect merge parent. Consider a
repository with trunk, branch1 of trunk, and branch2 of branch1.
Without this change, git interprets a merge of branch2 into trunk as a
merge of branch1 into trunk.
Beat Bolli bbo...@ewanet.ch writes:
Adding __git_ps1() to one's bash prompt displays various repo status
info after each command. After committing a git cherry-pick -n using
git-gui, the prompt still contains the |CHERRY-PICKING flag.
Delete the file causing this flag when cleaning up.
Richard Purdie richard.pur...@linuxfoundation.org writes:
I'd add that I think the commit made for the original problem[1] has
fixed this scenario since it now will prefer foo over foo.git also in
the fetch case even if the / is removed from the url.
OK.
As understand it, these check various
Michael Haggerty mhag...@alum.mit.edu writes:
I can work around the problem by using --root=/run/shm.
I do not necessarily think it is a work around.
A low-impact approach may be to update the part that parses --root
option to do
root=$(...)
root=$( cd $root /bin/pwd )
or
mhag...@alum.mit.edu writes:
Given that a flag day would anyway be required to add a d/f-tolerant
system, I could live with a separate graveyard namespace as
originally proposed by Jeff.
However, I still think that as long as we are making a jump, we could
try to land closer to the ultimate
mhag...@alum.mit.edu writes:
From: Michael Haggerty mhag...@alum.mit.edu
In the example line as written,
gitproxy=proxy-command for kernel.org
the quotation marks are eaten by the config-file parser. From the
history, it looks like this example wanted to have quotation marks in
On Sat, Aug 18, 2012 at 3:51 PM, Sam Vilain s...@vilain.net wrote:
On 08/11/2012 10:14 AM, Steven Walter wrote:
This fixes a bug where git finds the incorrect merge parent. Consider a
repository with trunk, branch1 of trunk, and branch2 of branch1.
Without this change, git interprets a merge
mhag...@alum.mit.edu writes:
To add a new proxy, without altering any of the existing ones, use
-% git config core.gitproxy 'proxy-command for example.com'
+% git config --add core.gitproxy 'proxy-command for example.com'
Sensible; thanks.
--
To unsubscribe
On 18 Aug 2012, at 22:39, Junio C Hamano wrote:
Do we _know_ already what the ultimate destination looks like?
If the answer is yes, then I agree, but otherwise, I doubt it is a
good idea to introduce unnecessary complexity to the system that may
have to be ripped out and redone.
I
Maaartin graj...@seznam.cz writes:
Instead I get deleted file. Adding the file to the index changes
it. This is IMHO a bug.
There are 7 interesting combinations for the state of a path. It
either exists in or missing from the commit you are gving to git
diff, it either exists in or missing
Jared Hance jaredha...@gmail.com writes:
[administrivia: do not deflect a direct response to you away by
using mail-followup-to header, thanks]
On Fri, Aug 17, 2012 at 11:47:49AM -0400, George Spelvin wrote:
Something like git commit --fixup HEAD~3, where git commit --fixup HEAD
would be
On Sat, 2012-08-18 at 13:33 -0700, Junio C Hamano wrote:
Richard Purdie richard.pur...@linuxfoundation.org writes:
I'd add that I think the commit made for the original problem[1] has
fixed this scenario since it now will prefer foo over foo.git also in
the fetch case even if the / is
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
On 08/18/2012 01:43 PM, Steven Walter wrote:
How about a Signed-Off-By?
Signed-Off-By: Sam Vilain s...@vilain.net
Sam
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Junio C Hamano gits...@pobox.com writes:
The bigger question is whether this example is improved by including
quotation marks, or whether they are just a distraction from the main
point. I abstain.
Thanks for spelling that bigger question out. Given that the
example is showing distinction
Sam Vilain s...@vilain.net writes:
On 08/18/2012 01:43 PM, Steven Walter wrote:
How about a Signed-Off-By?
Signed-Off-By: Sam Vilain s...@vilain.net
I think you meant reviewed-by or acked-by?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Alexey Muranov alexey.mura...@gmail.com writes:
On 18 Aug 2012, at 22:39, Junio C Hamano wrote:
Do we _know_ already what the ultimate destination looks like?
If the answer is yes, then I agree, but otherwise, I doubt it is a
good idea to introduce unnecessary complexity to the system
31 matches
Mail list logo
