* [PATCH 1/2] Fixing path quoting in git-rebase
From: Jonathan del Strother @ 2007-10-17 9:31 UTC (permalink / raw)
To: git; +Cc: Jonathan del Strother
In-Reply-To: <11926134961610-git-send-email-maillist@steelskies.com>
From: Jonathan del Strother <jon.delStrother@bestbefore.tv>
git-rebase used to fail when run from a path with a space in.
Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv>
---
git-rebase.sh | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 1583402..224cca9 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -59,7 +59,7 @@ continue_merge () {
die "$RESOLVEMSG"
fi
- cmt=`cat $dotest/current`
+ cmt=`cat "$dotest/current"`
if ! git diff-index --quiet HEAD
then
if ! git-commit -C "$cmt"
@@ -84,14 +84,14 @@ continue_merge () {
}
call_merge () {
- cmt="$(cat $dotest/cmt.$1)"
+ cmt="$(cat "$dotest/cmt.$1")"
echo "$cmt" > "$dotest/current"
hd=$(git rev-parse --verify HEAD)
cmt_name=$(git symbolic-ref HEAD)
- msgnum=$(cat $dotest/msgnum)
- end=$(cat $dotest/end)
+ msgnum=$(cat "$dotest/msgnum")
+ end=$(cat "$dotest/end")
eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
- eval GITHEAD_$hd='"$(cat $dotest/onto_name)"'
+ eval GITHEAD_$hd='$(cat "$dotest/onto_name")'
export GITHEAD_$cmt GITHEAD_$hd
git-merge-$strategy "$cmt^" -- "$hd" "$cmt"
rv=$?
@@ -140,10 +140,10 @@ do
}
if test -d "$dotest"
then
- prev_head="`cat $dotest/prev_head`"
- end="`cat $dotest/end`"
- msgnum="`cat $dotest/msgnum`"
- onto="`cat $dotest/onto`"
+ prev_head=$(cat "$dotest/prev_head")
+ end=$(cat "$dotest/end")
+ msgnum=$(cat "$dotest/msgnum")
+ onto=$(cat "$dotest/onto")
continue_merge
while test "$msgnum" -le "$end"
do
@@ -160,11 +160,11 @@ do
if test -d "$dotest"
then
git rerere clear
- prev_head="`cat $dotest/prev_head`"
- end="`cat $dotest/end`"
- msgnum="`cat $dotest/msgnum`"
+ prev_head=$(cat "$dotest/prev_head")
+ end=$(cat "$dotest/end")
+ msgnum=$(cat "$dotest/msgnum")
msgnum=$(($msgnum + 1))
- onto="`cat $dotest/onto`"
+ onto=$(cat "$dotest/onto")
while test "$msgnum" -le "$end"
do
call_merge "$msgnum"
--
1.5.3.1
^ permalink raw reply related
* [PATCH] Quoting paths, take 3
From: Jonathan del Strother @ 2007-10-17 9:31 UTC (permalink / raw)
To: git
In-Reply-To: <B495731E-C854-450B-943B-B96248B8F609@steelskies.com>
These patches attempt to fix things up for people who like to have awkward directory paths including spaces & apostrophes. First patch fixes git-rebase (all other git tools handle these paths fine), second patch fixes up the tests so they can be run from spaced directories.
Third time lucky?
^ permalink raw reply
* Re: [PATCH] Teach "git reflog" a subcommand to delete single entries
From: Wincent Colaiuta @ 2007-10-17 9:24 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, spearce, gitster
In-Reply-To: <Pine.LNX.4.64.0710170249260.25221@racer.site>
El 17/10/2007, a las 3:50, Johannes Schindelin escribió:
> This commit implements the "delete" subcommand:
>
> git reflog delete master@{2}
>
> will delete the second reflog entry of the "master" branch.
>
> With this, it should be easy to implement "git stash pop" everybody
> seems to want these days.
Looks good to me. Thanks for taking the initiative, Johannes.
Cheers,
Wincent
^ permalink raw reply
* Re: [PATCH 1/3] Fixing path quoting in git-rebase
From: Jonathan del Strother @ 2007-10-17 9:14 UTC (permalink / raw)
To: Johannes Sixt; +Cc: git
In-Reply-To: <47136D92.8060104@viscovery.net>
On 15 Oct 2007, at 14:39, Johannes Sixt wrote:
> Jonathan del Strother schrieb:
>> - eval GITHEAD_$hd='"$(cat $dotest/onto_name)"'
>> + eval GITHEAD_$hd='"$(cat \"$dotest/onto_name\")"'
>
> I believe this is not correct. It should be this way:
>
> eval GITHEAD_$hd='$(cat "$dotest/onto_name")'
>
> You can test it with a conflicting git-rebase -m. It only affects
> what the conflict markers look like. The test suite does not test it.
Thanks for catching that. I'll post revised patches this morning
^ permalink raw reply
* Re: On Tabs and Spaces
From: Michael Witten @ 2007-10-17 9:09 UTC (permalink / raw)
To: Luke Lu; +Cc: git
In-Reply-To: <3A9408D5-2667-43A6-A0CE-C0720B3A3987@vicaya.com>
On 17 Oct 2007, at 3:17:08 AM, Luke Lu wrote:
> But I still haven't seen any compelling arguments against the "all
> space" case
Overhead!
If you use 8 spaces instead of one tab,
that's using up 7x more space!
Consider:
# calculates the extra space required to
# use the given number of spaces/tab.
size()
{
count=`grep -RIo "\`printf \"\t\"\`" . | wc -l`;
perl -e "print $count*$(($1-1))/1024/1024 . \" MB\n\"";
}
Then in in a git working tree:
size 8; # 1.28701210021973 MB
size 4; # 0.551576614379883 MB
In a linux kernel working tree:
size 8; # 61.4902725219727 MB
size 4; # 26.3529739379883 MB
Conclusion:
Yikes!
I hate tabs, but I can't argue with that!
Michael Witten
^ permalink raw reply
* Re: [PATCH 1/6] more compact progress display
From: Karl Hasselström @ 2007-10-17 8:20 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: Nicolas Pitre, git
In-Reply-To: <20071017021137.GO13801@spearce.org>
On 2007-10-16 22:11:37 -0400, Shawn O. Pearce wrote:
> Nicolas Pitre <nico@cam.org> wrote:
>
> > Each progress can be on a single line instead of two.
>
> Nice. Of course that screws with git-gui and now I have to match two
> regexs and not one. But whatever.
Maybe an env variable could cause the code to emit machine-friendly
progress information instead?
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply
* Re: revised: [PATCH] Color support added to git-add--interactive.
From: Shawn O. Pearce @ 2007-10-17 8:11 UTC (permalink / raw)
To: Dan Zwell
Cc: Jeff King, Wincent Colaiuta, Git Mailing List,
Jonathan del Strother, Johannes Schindelin, Frank Lichtenheld
In-Reply-To: <cff973550710170057i7a09eff6m5bd8268498774238@mail.gmail.com>
Dan Zwell <dzwell@gmail.com> wrote:
> Sorry, that I didn't read the document on submitting patches before
> this. I will make the other changes you mention and re-send this in
> the proper formatting.
I really should have pointed you to Documentation/SubmittingPatches
when I responded to your email in the first place. Sorry I didn't
do that. Looks like you already found it though so good.
> > > +Note: these are not the same colors/attributes that the
> > > +rest of git supports, but are specific to git-add--interactive.
> >
> > This is a problem in my opinion. Why can't it match the same
> > names that the C code recognizes? What if we one day were to
> > see git-add--interactive.perl converted to C? How would we then
> > reconcile the color handling at that point in time?
>
> Makes sense. I am adding a bit of code to parse git color strings into
> perl color strings (so the user can use the same color names as with
> the rest of git). I know this is a small change, but I'm learning perl
> as I go, and I have exams this week, so it will take at least a day or
> two. I will fix the color issue, and send a properly formatted and
> signed-off patch. (Yes, I do agree to the Developer's Certificate of
> Origin wrt to this patch.)
>
> Thanks for your patience,
Thanks for working on this. I played around with your patch tonight
and although I use git-gui more often than `git add -i` for hunk
manipulation I really preferred your colorized version of git-add
-i over the non-colorized one. So I'm looking forward to seeing
the final result of this and getting it into the main tree.
Of course there is also no rush to getting your change in. We don't
have any sort of release deadlines. So don't stress out about it
too much. :)
--
Shawn.
^ permalink raw reply
* Re: revised: [PATCH] Color support added to git-add--interactive.
From: Dan Zwell @ 2007-10-17 7:57 UTC (permalink / raw)
To: Shawn O. Pearce
Cc: Jeff King, Wincent Colaiuta, Git Mailing List,
Jonathan del Strother, Johannes Schindelin, Frank Lichtenheld
In-Reply-To: <20071017015152.GN13801@spearce.org>
On 10/16/07, Shawn O. Pearce <spearce@spearce.org> wrote:
> Dan Zwell <dzwell@gmail.com> wrote:
> > Adds color to the prompts and output of git-add--interactive.
>
> I'm probbaly going to publish this in `pu` tonight but I have some
> comments that I think need to be addressed before this graduates
> any further.
>
> First off, no Signed-off-by? This is big enough that I refuse to
> put it in the main tree without one. Second it would really have
> helped if the email was formatted with `git format-patch`. Copying
> the message headers and body over for the commit message was less
> than fun. I have better things to do with my time.
Sorry, that I didn't read the document on submitting patches before
this. I will make the other changes you mention and re-send this in
the proper formatting.
>
> > +color.interactive.<slot>::
> > + Use customized color for add--interactive output. `<slot>`
>
> You probably should talk about `git add --interactive` as that
> is what the git-add documentation calls it. Many end-users don't
> even know that `git add -i` is exec()'ing into another program to
> accomplish its task. I fixed this up when I applied the patch.
>
> > +Note: these are not the same colors/attributes that the
> > +rest of git supports, but are specific to git-add--interactive.
>
> This is a problem in my opinion. Why can't it match the same
> names that the C code recognizes? What if we one day were to
> see git-add--interactive.perl converted to C? How would we then
> reconcile the color handling at that point in time?
Makes sense. I am adding a bit of code to parse git color strings into
perl color strings (so the user can use the same color names as with
the rest of git). I know this is a small change, but I'm learning perl
as I go, and I have exams this week, so it will take at least a day or
two. I will fix the color issue, and send a properly formatted and
signed-off patch. (Yes, I do agree to the Developer's Certificate of
Origin wrt to this patch.)
Thanks for your patience,
Dan
>
> --
> Shawn.
>
^ permalink raw reply
* Re: git-cherry-pick no longer detecting moved files in 1.5.3.4
From: Richard Quirk @ 2007-10-17 7:55 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
In-Reply-To: <20071017073357.GA13801@spearce.org>
On 10/17/07, Shawn O. Pearce <spearce@spearce.org> wrote:
>
> That's an "old" bug. Lars Hjemli fixed this in df3a02f612 back on
> Sept 25th. You can get the fix from either Junio's or my git tree
> in the master branch.
Yes, with that fix setting the diff.renamelimit config value to 0
really does work. Thanks!
^ permalink raw reply
* Re: [PATCH 01/25] Add a simple option parser.
From: Pierre Habouzit @ 2007-10-17 7:52 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
In-Reply-To: <20071017072419.GZ13801@spearce.org>
[-- Attachment #1: Type: text/plain, Size: 1530 bytes --]
On Wed, Oct 17, 2007 at 07:24:19AM +0000, Shawn O. Pearce wrote:
> Pierre Habouzit <madcoder@debian.org> wrote:
> > The option parser takes argc, argv, an array of struct option
> > and a usage string. ...
>
> OK, I've chewed down some version of this series. ;-)
>
> To be more specific I fetched ph/parseopt (11b83dc4da) from your
> tree at git://git.madism.org/git.git and split it apart somewhat.
> All of the patches were rebased onto my most recent master but I
> also yanked the two that impacted the builtin-fetch series out and
> layered them over a merge of db/fetch-pack and my version of your
> ph/parseopt series.
>
> Why? Well I want to keep our options open about which series
> graduates to master first. Although builtin-fetch has been cooking
> for a while there's been a number of issues with that code.
> There exists a (perhaps small) chance that ph/parseopt will be
> ready before db/fetch-pack.
Yes, this makes sense, otoh the migration of the fetch commands are
really independant so you can put those appart, even if I end up needing
to rewrite them it's not an issue.
> Currently ph/parseopt is in pu. Tomorrow I'll look at the usage
> strings in more depth and see if any improvements can be easily
> made. I already made one suggested by Dscho in builtin-add.
wonderful, thanks.
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [PATCH 0/7] Bisect dunno
From: Shawn O. Pearce @ 2007-10-17 7:35 UTC (permalink / raw)
To: Christian Couder; +Cc: Junio Hamano, Johannes Schindelin, git
In-Reply-To: <20071014142826.8caa0a9f.chriscool@tuxfamily.org>
Christian Couder <chriscool@tuxfamily.org> wrote:
> Here is my bisect dunno patch series again.
> The changes since last time are the following:
I now have this series queued in my pu branch. It passes the tests
it comes with, and doesn't appear to break anything, but apparently
there is also still some debate about what a dunno should be called
("unknown", "void", "ugly", "dunno", "skip" ...).
--
Shawn.
^ permalink raw reply
* Re: git-cherry-pick no longer detecting moved files in 1.5.3.4
From: Shawn O. Pearce @ 2007-10-17 7:33 UTC (permalink / raw)
To: Richard Quirk; +Cc: Michele Ballabio, git
In-Reply-To: <cac9e4380710170018p26ae8935xc4d3218f4db5411d@mail.gmail.com>
Richard Quirk <richard.quirk@gmail.com> wrote:
> On 10/17/07, Michele Ballabio <barra_cuda@katamail.com> wrote:
> > It should be
> > diff.renamelimit = 0
> >
> > to set the "unlimited" limit.
> >
>
> This doesn't work either. Cherry picking is not triggering the loading
> of this value at all.
>
> This is because git-cherry-pick turns into a git-merge-recursive. This
> calls get_renames() in merge-recursive.c, which calls diff_setup,
> setting the renamelimit to -1, then calls diff_setup_done(), which
> sets the renamelimit to diff_rename_limit_default since rename_limit
> was < 0. diff_rename_limit_default is the hard-coded value of 100. At
> no point does merge-recursive call git_diff_ui_config() in diff.c that
> reads in the diff.renamelimit user defined value, so in the end the
> cherry pick uses the hardcoded value of 100.
That's an "old" bug. Lars Hjemli fixed this in df3a02f612 back on
Sept 25th. You can get the fix from either Junio's or my git tree
in the master branch.
--
Shawn.
^ permalink raw reply
* Re: How to Import a bitkeeper repo into git - Had a few questions on Qgit; I like the GUI.
From: Marco Costalba @ 2007-10-17 7:30 UTC (permalink / raw)
To: pete, piet.delaney
Cc: Linus Torvalds, VMiklos, free cycle, git, piet.delaney,
Piet Delaney
In-Reply-To: <47159779.6010502@bluelane.com>
On 10/17/07, Pete/Piet Delaney <pete@bluelane.com> wrote:
>
> While I'm looking at the diffs for a file if I pull down External Diff
> it launches 'kcompare' but for a file with a large change it seems
> to be running extremely slow.
qgit does not intergarte Kompare functionality, it just prepares the
files and spawns a Kompare process.
So there's seem nothing qgit can do about Kompare speed. You can try
with different diff viewers, meld,...etc..
> for small files. Know of what can me done so that 'kcompare' works
> fast on large files; something like pointing it's tmp files to a
> not NFS partition.
>
Well temporary file sfor Kompare are created in the repository working
directory. If this is a problem for you you can save manually the
files corresponding to the two revisions you want to diff (open tree
view, select the file, right click to open context menu, save as...)
You need to repeat the above 'save as...' the first time selecting the
first revision you want to compare, then selecting the other revision
in main view, so that tree view is updated and you end-up saving the
correct files.
You can save the files where you want then run Kompare manually, at
least you test your assumption about slowness of NFS partition.
>
> Another problem I've noticed is that sometime while running git
> it seems to spend a large amount of time switching from one
> change-set to the next; seems to be due to all of the tagged
> files.
>
If you can post a repository where this occurs and the step to
reproduce I can investigate further.
> > Another feature you asked, i.e. CTRL + right click to select a
> > revision (different from the parent) to diff against the current one
> > is also already implemented.
>
> It seems that while I'm in "Rev List" mode I can select the the
> two versions to compare a selected file with View->External diff...
>
> Now, if I pull down "View File" or go to the file context were
> you see the change-set for a file then I can't get the CTRL + right
> click to allow me to diff two revisions of the file.
>
Yes. This is true, is not supported this feature. Maybe could be added ;-)
>
> MY guess is that I should install a newer version of qgit,
> I'm using 1.5.3.
>
Please install 1.5.7, it has several bugs fixed.
> How difficult is it to upgrade to the Qt4. Can I just
> install it to /usr/local and not interfere with Qt3?
It does not interfere wuth Qt3 also if you install with urpmi,
directories are kept separated. I have installed both with no
problems.
> Last I recall messing with installing ethereal from src
> I needed a graphics lib and as I recall installing it in
> /usr/local/ confused some build crap. It would be interesting
> to try out your new qgit-2.0.
>
Qt4 is big and complex, I would really suggest avoid experimenting
with that library, stay safe and use urpmi.
> >
> > And of course the two above features can be integrated: you select two
> > random revisions and then call the external diff viewer to check at
> > the differences in the way you prefer.
>
> Right, but how do I do this from the file context?
>
In this case (and also in the above case of external viewer) you need
the magic wand ;-)
Select a file from tree view, go with the magic wand and you can do
everithing from main view.
>
> it seems to be pretty big. The date on 1.5.7 was very
> close to 2.0 so I thought they might be very close in
> functionality and you maintaining the same code for
> both the common Qt3 and the new Qt4 to make it easy
> for users to install.
>
Yes it is. qgit-1.5.7 should be very similar to qgit-2.0 regarding the
features you listed above.
Marco
^ permalink raw reply
* Re: [PATCH 01/25] Add a simple option parser.
From: Shawn O. Pearce @ 2007-10-17 7:24 UTC (permalink / raw)
To: Pierre Habouzit; +Cc: git
In-Reply-To: <1192523721-18985-1-git-send-email-madcoder@debian.org>
Pierre Habouzit <madcoder@debian.org> wrote:
> The option parser takes argc, argv, an array of struct option
> and a usage string. ...
OK, I've chewed down some version of this series. ;-)
To be more specific I fetched ph/parseopt (11b83dc4da) from your
tree at git://git.madism.org/git.git and split it apart somewhat.
All of the patches were rebased onto my most recent master but I
also yanked the two that impacted the builtin-fetch series out and
layered them over a merge of db/fetch-pack and my version of your
ph/parseopt series.
Why? Well I want to keep our options open about which series
graduates to master first. Although builtin-fetch has been cooking
for a while there's been a number of issues with that code.
There exists a (perhaps small) chance that ph/parseopt will be
ready before db/fetch-pack.
Currently ph/parseopt is in pu. Tomorrow I'll look at the usage
strings in more depth and see if any improvements can be easily
made. I already made one suggested by Dscho in builtin-add.
--
Shawn.
^ permalink raw reply
* Re: git-cherry-pick no longer detecting moved files in 1.5.3.4
From: Richard Quirk @ 2007-10-17 7:18 UTC (permalink / raw)
To: Michele Ballabio; +Cc: git
In-Reply-To: <200710170035.12482.barra_cuda@katamail.com>
On 10/17/07, Michele Ballabio <barra_cuda@katamail.com> wrote:
> On Wednesday 17 October 2007, Richard Quirk wrote:
> > I tried setting diff.renamelimit to -1 but to no
> > avail.
>
> It should be
> diff.renamelimit = 0
>
> to set the "unlimited" limit.
>
This doesn't work either. Cherry picking is not triggering the loading
of this value at all.
This is because git-cherry-pick turns into a git-merge-recursive. This
calls get_renames() in merge-recursive.c, which calls diff_setup,
setting the renamelimit to -1, then calls diff_setup_done(), which
sets the renamelimit to diff_rename_limit_default since rename_limit
was < 0. diff_rename_limit_default is the hard-coded value of 100. At
no point does merge-recursive call git_diff_ui_config() in diff.c that
reads in the diff.renamelimit user defined value, so in the end the
cherry pick uses the hardcoded value of 100.
^ permalink raw reply
* Re: On Tabs and Spaces
From: Luke Lu @ 2007-10-17 7:17 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Christer Weinigel, Tom Tobin, git
In-Reply-To: <alpine.LFD.0.999.0710161722320.26902@woody.linux-foundation.org>
I'm late in this game. But it's too classic a debate to miss the fun.
On Oct 16, 2007, at 5:45 PM, Linus Torvalds wrote:
> One issue may well be that Windows programmers also probably don't
> work
> very much with patches, do they?
>
> One reason for *really* wanting to use hard-tabs is that it makes
> patches
> look better, exactly because diffs contain that one extra (or two,
> in the
> case of old-style context diffs) character at the beginning of the
> line.
>
> Which means that while all-space indents look fine, *mixing* styles
> definitely does not. In particular, a two-character indent (which
> hopefully nobody uses, but people are crazy) will be totally
> unreadable as
> a patch if you have the (fairly common, at least in UNIX projects)
> style
> of using spaces for less-than-eight-character-indents and tabs for the
> full 8 characters.
Yes, all-space would look fine in patches. It'll look better than all
tabs for tables and ascii formula and diagrams in comments, as one
prepended character could screw up the tabs (depending on the
content), rendering them totally unreadable. In all-space case,
things just shift to the right by one character column.
I believe the indentation convention for ruby is 2 spaces. It looks
tight to me :)
> (In particular, a 3-level and 4-level indent will look *identical*
> in such
> a project, when using context diffs).
>
> And sure, you can use all-spaces-everywhere, but that just isn't
> what any
> normal UNIX editors are set up for by default. In contrast, under
> UNIX, I
> can pretty much guarantee that hard-tab indents look at least
> reasonable
> in any editor.
But all-space would look perfect in any editor as the authors
intended, including the tables and ascii arts, as long as it's using
monospace font. It's easy to setup all space editing on all platforms
(Windows, Mac, *nix) It's also much easier to enforce. I've used pre-
commit hook to check for tabs in the source and reject them if a tab
is found :)
> And if you have an editor that shows hard-tabs as 4-character indents,
> generally you can work with it. You may have odd indentation, and
> people
> may complain about your patches not lining up, and yes, it would be
> up to
> *you* to understand that 8-wide tabs are the normal and default.
> But you
> can certainly work with a source base that uses a single hard-tab for
> indentation.
> In contrast, if you use spaces (or worse - mixing), things really look
> ugly as sin, to the point of actually being unworkable.
>
Well, we just established that all-space is perfect, look-wise.
> In short:
>
> - if the project has the rule that an indentation is "one hard-
> tab", then
> at least everybody can *work* with that project. Different
> people may
> see things laid out slightly differently, but it's generally not a
> horrible disaster, especially if you aim to use block comments
> indented
> with the code (like we *mostly* do both in the kernel and in git)
>
> - all-space and all-tabs just leads to problems. Yes, I know about
> python, but lets face it, python is different, since the spacing
> has
> semantic rules there. Most non-python programmers will not use
> editors
> where you can obviously see the difference between spaces and
> tabs, and
> as a result an all-space model will *turn* into a mixed-space/tab
> model, and you get horrible end results.
As I mentioned, an all-space policy is trivial to enforce.
> - as per above, mixing spaces and tabs is a *horrid* idea.
>
> - as a result, a "pure tab for indents" model tends to be workable in
> most situations. It may not be ideal for you, but it's workable.
>
> - and at least in the UNIX world, default for pure tabs really is 8
> characters. Even if you have an editor that shows them as four,
> you'll
> see different results outside the editor (eg "grep -5 file.c"), so
> people should just consider other tab sizes to be "secondary".
>
> And as long as 99% of all git developers are under Linux, and
> all the
> core ones seem to have had no problem with the current tab rules, I
> really don't see why that should change.
>
> See? Hard-tabs are good. Maybe Windows people don't ever see patches
> (perhaps they only see them as side-by-side graphical things), and
> maybe
> windows projects are always done inside *one* environment where
> there is
> no "grep" and "terminal TAB size" and "fifty different editors with
> different defaults".
>
> But even in DOS/Windows, hard-tabs seem to be quite common, judging by
> what little source code I've seen from Windows projects.
>
> And I just checked. The current git model seems to work fine if you
> have
> an editor that thinks tabs are 4 spaces:
>
> sed 's/ / /g' < revision.c | less -S
>
> (that's a hard-tab in that first regex). No, things don't
> necessarily line
> up just like they should, but you actually have to *look* for
> problems to
> see them (ie stuff where people have added line-breaks).
>
> And is it really so unreasonable to just say "8-character tabs are the
> gold standard"?
But I still haven't seen any compelling arguments against the "all
space" case, other than "people will screw it up into mixed spaces",
which is really a straw man, as many multi-platform projects enforced
the all-space policy easily by using a pre-commit hook in
maintainers' repository.
The only downside of all-space is a moderate space bloat in source,
which is insignificant, all things considered.
I agree that "8-character tabs are the gold standard", only for the
tabstop==8 part but not the indent==tab part. For me the question is:
is it really so unreasonable to just say "all-space is the holy grail"?
__Luke
^ permalink raw reply
* Re: How to Import a bitkeeper repo into git
From: Marco Costalba @ 2007-10-17 7:14 UTC (permalink / raw)
To: pete; +Cc: Linus Torvalds, VMiklos, free cycle, git
In-Reply-To: <47159BF9.9040400@bluelane.com>
On 10/17/07, Pete/Piet Delaney <pete@bluelane.com> wrote:
>
> 't' worked fine but still can see how to diff do of the list of
> changes for a file. Viewing diffs of files based on change sets
> worked fine but I think with BitKeeper I found it helpful to be
> able to do a full 'kompare' type diff the file only; often I'm
> not interested in which change set it went into.
>
Well, open tree view ('t'), select the file you are interested of,
then click the magic wand button on the tool bar, now revisions you
see are filtered by that file, if you browse the revisions the
patch/diff you see will always point to your file (also if you can see
the whole patch).
> Something for a future version or am I lucky and you have
> it covered already?
>
Don't know, depends on how you answer to the above point ;-)
>
> Good Idea, thought it's brought up a few questions:
>
> 1. When I do the <control-minis> to Decrease the font size
> I can't undo it with the <control-plus>. Also <control-plus>
> doesn't seem to do anything.
>
> 2. When displaying the "Lane info" why can't I see the
> branch names?
>
Thanks for the reports, I will investigate as soon as I have a bit of
spare time.
>
> I'll read it a few more times. I seem to sometimes get into a state
> where I'm locked onto the current change set and can't get back to
> the other change sets without starting another qgit.
>
Please, could you be so kind to better explain me the above point.
Seems interesting, but I didn't get how to reproduce.
> >
> > Yes it is. There are a lot of new featrures, is almost as stable as
> > the previous and if you are interested in file history (annotations)
> > in qgit-2.0 this feature has been greatly speeded up.
>
> Do you know if it's a lot of work to install Qt4?
>
With Mandriva you are just at an uprmi away.
Try something like
urpmi libqt4-devel
It worked for me ;-)
Marco
^ permalink raw reply
* Re: A note from the interim Git maintainer
From: Shawn O. Pearce @ 2007-10-17 7:13 UTC (permalink / raw)
To: Eric Wong; +Cc: git, Junio C Hamano, Benoit Sigoure, Eygene Ryabinkin
In-Reply-To: <20071017063132.GA458@soma>
Eric Wong <normalperson@yhbt.net> wrote:
> I've pushed out Benoit's and Eygene's latest git-svn changes to master
> on http://git.bogomips.org/git-svn.git These changes are against
> spearce/master.
>
> I've amended Benoit's commit messages a bit and fixed one bug in
> git svn propget (also amended).
Thanks. I originally skipped over Benoit's changes as I hadn't see
anything from you on the subject. But I have now cherry-picked them
from your bogomips git-svn tree into spearce/master. Pushing it
out in a minute.
> Benoit Sigoure (5):
> git-svn: add a generic tree traversal to fetch SVN properties
> git-svn: implement git svn create-ignore
> git-svn: add git svn propget
> git-svn: add git svn proplist
> git-svn: simplify the handling of fatal errors
>
> Eygene Ryabinkin (2):
> git-svn: respect Subversion's [auth] section configuration values
> git-svn: use "no warnings 'once'" to disable false-positives
I apparently already had that first one from Eygene ("[auth]
section") in spearce/master; it went out last night. Perhaps you
ran the shortlog above against Junio's tree and not mine?
The second one from Eygene ("no warnings once") I already had in
my master from the resend you had earlier made to the list with
your Ack and fixups.
--
Shawn.
^ permalink raw reply
* Re: How to Import a bitkeeper repo into git
From: Marco Costalba @ 2007-10-17 6:57 UTC (permalink / raw)
To: Andreas Ericsson; +Cc: pete, Linus Torvalds, VMiklos, free cycle, git
In-Reply-To: <4714EF53.8090707@op5.se>
On 10/16/07, Andreas Ericsson <ae@op5.se> wrote:
> Marco Costalba wrote:
> > On 10/16/07, Pete/Piet Delaney <pete@bluelane.com> wrote:
> >
> >> Would it be worthwhile
> >> to install Qt4 from src and try to use qgit-2.0?
> >>
> >
> > Yes it is. There are a lot of new featrures, is almost as stable as
> > the previous and if you are interested in file history (annotations)
> > in qgit-2.0 this feature has been greatly speeded up.
> >
>
> The only thing I really, really, really don't like about qgit4 is the
> fact that it fudges up the commit-message. I've been trying for two
> days to get rid of the HTML output, but I just can't get it done
> without the signed-off-by email being enclosed in <> tags.
>
You mean when you commit some changes or when you brows the revisions?
If it is the highlighted title that annoy you I can try to remove the
background color, or set as plain text as an option.
> view without the colored box a lot more). The little arrows in the
> commit window are also fairly annoying, as one quite quickly understands
> that up-/down-arrows work much better for that sort of stuff anyway.
>
Little arrows should already be removable from settings->browse->'Show
smart labels' , you can also add lateral tabs with
settings->browse->'Show tabbed revisions' if you like.
Marco
^ permalink raw reply
* Re: [PATCH 1/6] more compact progress display
From: Shawn O. Pearce @ 2007-10-17 6:37 UTC (permalink / raw)
To: Johannes Sixt; +Cc: Nicolas Pitre, git
In-Reply-To: <4715ACE4.9080907@viscovery.net>
Johannes Sixt <j.sixt@viscovery.net> wrote:
> Nicolas Pitre schrieb:
> >- start_progress_delay(&progress, "Checking %u files out...",
> >- "", total, 50, 2);
> >+ start_progress_delay(&progress, "Checking files out",
> >+ total, 50, 2);
>
> While you are here, could you make that "Checking out files", please?
I'll amend it right now. I'm finishing up building my nightly
update to git/spearce.git and this is about to go into next.
So... you just caught me in time to do an amend. :-)
--
Shawn.
^ permalink raw reply
* Re: [PATCH 1/6] more compact progress display
From: Johannes Sixt @ 2007-10-17 6:34 UTC (permalink / raw)
To: Nicolas Pitre; +Cc: Shawn O. Pearce, git
In-Reply-To: <1192586150-13743-2-git-send-email-nico@cam.org>
Nicolas Pitre schrieb:
> - start_progress_delay(&progress, "Checking %u files out...",
> - "", total, 50, 2);
> + start_progress_delay(&progress, "Checking files out",
> + total, 50, 2);
While you are here, could you make that "Checking out files", please?
-- Hannes
^ permalink raw reply
* Re: A note from the interim Git maintainer
From: Eric Wong @ 2007-10-17 6:31 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git, Junio C Hamano, Benoit Sigoure, Eygene Ryabinkin
In-Reply-To: <20071016055448.GA13801@spearce.org>
"Shawn O. Pearce" <spearce@spearce.org> wrote:
> As most folks are probably now well aware, Junio has been offline
> for about 11 days and may still be offline for a little while more.
> Before he dropped offline Junio shared why he left on such a short
> notice with both Dscho and myself, as it meant cancelling the
> "git together" we were planning to have last weekend in San Jose.
>
> I'm not going to get into the specific details as it is Junio's
> business and not mine. But I can say that my thoughts and prayers
> to $DEITY are with him and his family at this time, and I don't
> expect him to be rushing back to git work tomorrow. However I'm
> quite certain that Junio will return when he can.
>
> I've decided to step up and try to fill Junio's shoes. To that end
> I am publishing a maint, master, next (and soon) pu branch from a
> new fork on repo.or.cz:
Thanks for doing this, Shawn. I hope Junio is doing OK.
I've pushed out Benoit's and Eygene's latest git-svn changes to master
on http://git.bogomips.org/git-svn.git These changes are against
spearce/master.
I've amended Benoit's commit messages a bit and fixed one bug in
git svn propget (also amended).
Benoit Sigoure (5):
git-svn: add a generic tree traversal to fetch SVN properties
git-svn: implement git svn create-ignore
git-svn: add git svn propget
git-svn: add git svn proplist
git-svn: simplify the handling of fatal errors
Eygene Ryabinkin (2):
git-svn: respect Subversion's [auth] section configuration values
git-svn: use "no warnings 'once'" to disable false-positives
--
Eric Wong
^ permalink raw reply
* Re: Git User's Survey 2007 summary - git homepage improvements
From: Jakub Narebski @ 2007-10-17 6:21 UTC (permalink / raw)
To: Petr Baudis; +Cc: git
In-Reply-To: <20071017011835.GH18279@machine.or.cz>
On 10/17/07, Petr Baudis <pasky@suse.cz> wrote:
> On Mon, Oct 15, 2007 at 12:05:22AM +0200, Jakub Narebski wrote:
>> # Information about MS Windows version(s). Link to MSys Git, marking
>> it as under development; perhaps plea for help?
>
> I'm not sure what in particular the MSys people want... They may want to
> send patches, though. ;-)
>
> Maybe we could merge the (largely artificially separated anyway)
> subproject subsections to a single alphabetically-ordered subsection and
> include MSysGit there?
I was thinking more about adding link to MSysGit / GitMe / WInGit in the
"Getting Git"/"Binaries" section. I'm not sure what people who put this response
in survey want...
>> * Perhaps making some pages like FAQ or Tips and Tricks, or
>> discussion about nature of branches in git taken from GitWiki when
>> they are mature enough
>
> This touches a subject that I'm kind of surprised wasn't mentioned more,
> that is the homepage-wiki duality. Are people happy with the current
> setup? I kinda am, or would be if I got more patches. ;-) I'm personally
> not too fond of having project's main homepage in wiki -
> *especially* if it's made obvious by half of the screen space being
> occupied by wiki-generated metalinks. But if everyone else thinks that
> we should just move the main page to a wiki format, I won't stay in the
> way.
>
> I'd like to use this space to also repeat that I never seriously
> intended to maintain the technical side of the wiki, I've set up just
> because it was so damn easy. I have grown to just hate the wiki engine
> we use, and if someone wants to take the wiki over, you are welcome!
I'm very happy with homepage / wiki separation. IMVHO having wiki for
homepage is not a very good decision. I thought that wiki would be
more staging area for homepage, and that some content after maturing
would be put on homepage.
--
Jakub Narebski
^ permalink raw reply
* [PATCH] rev-list documentation: add "--bisect-all".
From: Christian Couder @ 2007-10-17 6:05 UTC (permalink / raw)
To: Junio Hamano, Johannes Schindelin, Frank Lichtenheld,
Ralf Wildenhues; +Cc: git
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
Documentation/git-rev-list.txt | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
This is a resend with some typos fixed.
Thanks to Ralf Wildenhues.
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 7cd0e89..4852804 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -34,6 +34,7 @@ SYNOPSIS
[ \--pretty | \--header ]
[ \--bisect ]
[ \--bisect-vars ]
+ [ \--bisect-all ]
[ \--merge ]
[ \--reverse ]
[ \--walk-reflogs ]
@@ -354,6 +355,21 @@ the expected number of commits to be tested if `bisect_rev`
turns out to be bad to `bisect_bad`, and the number of commits
we are bisecting right now to `bisect_all`.
+--bisect-all::
+
+This outputs all the commit objects between the included and excluded
+commits, ordered by their distance to the included and excluded
+commits. The farthest from them is displayed first. (This is the only
+one displayed by `--bisect`.)
+
+This is useful because it makes it easy to choose a good commit to
+test when you want to avoid to test some of them for some reason (they
+may not compile for example).
+
+This option can be used along with `--bisect-vars`, in this case,
+after all the sorted commit objects, there will be the same text as if
+`--bisect-vars` had been used alone.
+
--
Commit Ordering
--
1.5.3.4.206.g58ba4
^ permalink raw reply related
* Re: On Tabs and Spaces
From: David Kastrup @ 2007-10-17 5:56 UTC (permalink / raw)
To: git
In-Reply-To: <alpine.LFD.0.999.0710161559150.6887@woody.linux-foundation.org>
Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Tue, 16 Oct 2007, Tom Tobin wrote:
>>
>> But you then dismiss out of hand the option of using all spaces
>
> I do indeed. I don't think it's sensible.
Actually, it seriously degrades (both performance and savings)
deltifying once you reach an indentation of 16.
--
David Kastrup, Kriemhildstr. 15, 44793 Bochum
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox