On Sat, Dec 29, 2012 at 07:16:16PM -0500, Jason Holden wrote:
> When first doing a merge in git-gui, the "Visualize Merge" button is
> quite helpful to visualize the changes due to a merge.
> But once the merge is complete, there's not a similarly convenient
> way to recreate that merge view in gi
Chris Rorvick :
> I tried the new version and found I'm unable to import via pserver:
And now I know why. One of the cvsps fix patches I merged from Yann
Dirson's collection changed the --root option parsing in an
incompatible way. As soon as I figure out what it's doing I'll
either revert it or
Chris Rorvick :
> I tried the new version and found I'm unable to import via pserver:
>
> $ ./cvsps --root :pserver:me@localhost:/cvsroot module
> cvsps: connect error: Connection refused
> cvsps: can't get CVS log data: Connection refused
>
> Running 2.2b1 (the version packaged w/ Fedora 1
On Sun, Dec 30, 2012 at 1:21 PM, Eric S. Raymond wrote:
> Bad news: the combination of cvsps and the existing git-cvsimport
> script is seriously broken in both places. This morning I fixed a
> nasty bug in cvsps's branch detection and shipped 3.3. This is a
> different bug from the broken (and n
Thomas Ackermann writes:
>
> ./Documentation/technical contains not only API documentation but also
> several other documents describing Git implementation topics and thus
> is the place someone wanting to join Git development should look at.
Implementation details are part of API; CG and SP a
Antoine Pelisse writes:
> By the way, that merges without conflicts with Adam's series, but it
> will not compile as he renamed functions that I'm now using
> (path_excluded() -> is_path_excluded() that is).
>
> By the way, Junio, how do you handle this situation as a maintainer ?
> Do you keep a
On Sun, Dec 30, 2012 at 07:53:48PM +0700, Nguyen Thai Ngoc Duy wrote:
> > $ cd objects/pack && ls
> > pack-a3e262f40d95fc0cc97d92797ff9988551367b75.commits
> > pack-a3e262f40d95fc0cc97d92797ff9988551367b75.idx
> > pack-a3e262f40d95fc0cc97d92797ff9988551367b75.pack
> > pack-a3e262f40d95fc
Jason Holden writes:
> I spent a good amount of time yesterday figuring out the correct workflow
> to submit a change to gitk.
Thanks; I just realized that nothing in Documentation/ hierarchy
mentions these; they are only mentioned in "A Note from the
Maintainer" I send out every once in a while
Bad news: the combination of cvsps and the existing git-cvsimport
script is seriously broken in both places. This morning I fixed a
nasty bug in cvsps's branch detection and shipped 3.3. This is a
different bug from the broken (and now removed) ancestry-branch
tracking.
Good news: I have fixed al
I spent a good amount of time yesterday figuring out the correct workflow
to submit a change to gitk. As I understand it, gitk (and I think git-gui)
are maintained upstream of git, and patches should be sent to the git email
list against the upstream repo. I think a top-level MAINTAINERS file wou
On Saturday, December 29, 2012 03:18:49 pm Martin Fick wrote:
> Jeff King wrote:
> >On Thu, Dec 27, 2012 at 04:11:51PM -0700, Martin Fick
wrote:
> >> My idea is based on using filenames to store sha1s
> >> instead of file contents. To do this, the sha1 one of
> >> a ref would be stored in a file
On Sun, Dec 30, 2012 at 2:54 PM, Antoine Pelisse wrote:
> By the way, that merges without conflicts with Adam's series, but it
> will not compile as he renamed functions that I'm now using
> (path_excluded() -> is_path_excluded() that is).
Ah, renames! I forgot about those.
> By the way, Junio,
./Documentation/technical contains not only API documentation but also
several other documents describing Git implementation topics and thus
is the place someone wanting to join Git development should look at.
So IMHO CodingGuidelines and SubmittingPatches should also be there.
(One could even co
By the way, that merges without conflicts with Adam's series, but it
will not compile as he renamed functions that I'm now using
(path_excluded() -> is_path_excluded() that is).
By the way, Junio, how do you handle this situation as a maintainer ?
Do you keep a note to manually make the change eve
Test all possible use-cases of git-status --ignored with
--untracked-files to normal and all:
- untracked directory is listed as untracked if it has a mix of
untracked and ignored files in it.
with -uall, ignored/untracked files are listed as
ignored/untracked.
- untracked directory with onl
The current behavior of git-status is inconsistent and
misleading. Especially when used with --untracked-files=all option:
- files ignored in untracked directories will be missing from status
output.
- untracked files in committed yet ignored directories are also
missing.
- with --untracked-f
On Sun, Dec 30, 2012 at 7:05 PM, Jeff King wrote:
> So I was thinking about this, which led to some coding, which led to
> some benchmarking.
I like your way of thinking! May I suggest you take a new year break
first, then "think" about reachability bitmaps ;-) 2013 will be an
exciting year.
> I
On Sat, Dec 29, 2012 at 12:27:47AM -0500, Jeff King wrote:
> > If reachability bitmap is implemented, we'll have per-pack cache
> > infrastructure ready, so less work there for commit cache.
>
> True. I don't want to dissuade you from doing any commit cache work. I
> only wanted to point out that
$1 becomes undef by internal regex, since it has no capture groups.
Match against accpetable control characters using index() instead of a regex.
Signed-off-by: Orgad Shaneh
---
gitweb/gitweb.perl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitweb/gitweb.perl b/gitweb
Signed-off-by: Thomas Ackermann
---
Documentation/technical/coding-guidelines.txt | 175 ++---
Documentation/technical/submitting-patches.txt | 144 ++--
2 files changed, 174 insertions(+), 145 deletions(-)
diff --git a/Documentation/technical/coding-guideli
Signed-off-by: Thomas Ackermann
---
Documentation/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index e53d333..a51c00f 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -47,6 +47,8 @@ TECH_DOCS += technical/racy-gi
Signed-off-by: Thomas Ackermann
---
Documentation/{CodingGuidelines => technical/coding-guidelines.txt} | 0
Documentation/{SubmittingPatches => technical/submitting-patches.txt} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename Documentation/{CodingGuidelines => technical/coding-g
CodingGuidelines and SubmittingPatches are IMHO a little bit hidden in
./Documentation
and with respect to their content should be better placed in
./Documentation/technical.
[PATCH 1/3] Move CodingGuidelines to ./technical/coding-guidelines.txt and
SubmittingPatches to ./technical/submitting-
23 matches
Mail list logo
