Re: [PATCH v2] Thunderbird: fix appp.sh format problems

2012-08-31 Thread Marco Stornelli
Il 30/08/2012 19:00, Junio C Hamano ha scritto: Marco Stornelli writes: The current script has got the following problems: 1) It doesn't work if the language used by Thunderbird is not English; 2) The field To: filled by format-patch is not evaluated; 3) The field Cc: is loaded only from Cc u

Re: [PATCH v2] test: set the realpath of CWD as TRASH_DIRECTORY

2012-08-31 Thread Michael Haggerty
On 08/30/2012 07:26 AM, Junio C Hamano wrote: > Michael Haggerty writes: > >> By the way, is the use of realpath(3) permissible in git code? >> GIT_CEILING_DIRECTORIES handling could be fixed relatively easily by >> using this function to canonicalize pathnames before comparison. > > As long as

[PATCH v3] Thunderbird: fix appp.sh format problems

2012-08-31 Thread Marco Stornelli
The current script has got the following problems: 1) It doesn't work if the language used by Thunderbird is not English; 2) The field To: filled by format-patch is not evaluated; 3) The field Cc: is loaded from Cc used in the commit message instead of using the Cc field filled by format-patch in

[PATCH] i18n: mark more index-pack strings for translation

2012-08-31 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- The main string I'm after is "completed with %d local objects", which is part of typical UI. The rest is just "while at there..." To my surprise, (GNU) gettext does seem to know how to deal with PRIu32 macro in the middle of the string. builtin/index

Aw: Re: git blame shows wrong "Not commited yet" entries

2012-08-31 Thread Thomas Ackermann
You are right but as I mentioned in my posting I am using "core.ignorecase=true" so I expected "file.txt" and "File.txt" to be treated the same. The man-page for git-config says: "core.ignorecase If true, this option enables various workarounds to enable git to work better on filesystems that ar

[PATCH v4] Thunderbird: fix appp.sh format problems

2012-08-31 Thread Marco Stornelli
The current script has got the following problems: 1) It doesn't work if the language used by Thunderbird is not english; 2) The field To: filled by format-patch is not evaluated; 3) The field Cc: is loaded from Cc used in the commit message instead of using the Cc field filled by format-patch in

[PATCH] checkout: warn users if action is taken in ambiguous situation

2012-08-31 Thread Nguyễn Thái Ngọc Duy
"git checkout foo" (no more arguments) always checks out existing branch "foo" even if "foo" exists on working directory. To avoid confusion to users who do not know this exception, say something along the action. Signed-off-by: Nguyễn Thái Ngọc Duy --- Personally I disagree with the comment abo

Re: [PATCH 1/3] branch: introduce --set-upstream-to

2012-08-31 Thread Carlos Martín Nieto
Ralf Thielow writes: > On Thu, Aug 30, 2012 at 7:23 PM, Carlos Martín Nieto wrote: >> behaviour. To work around this, introduce --set-upstream-to which >> accepts a compulsory argument indicating what the new upstream branch >> should be and one optinal argument indicating which branch to change

Re: [PATCH 1/3] branch: introduce --set-upstream-to

2012-08-31 Thread Ralf Thielow
On Fri, Aug 31, 2012 at 5:22 PM, Carlos Martín Nieto wrote: > Ralf Thielow writes: > >> On Thu, Aug 30, 2012 at 7:23 PM, Carlos Martín Nieto wrote: >>> behaviour. To work around this, introduce --set-upstream-to which >>> accepts a compulsory argument indicating what the new upstream branch >>>

Re: [PATCH 2/4] merge-base: "--is-ancestor A B"

2012-08-31 Thread Martin von Zweigbergk
(Resending as plain text, sorry about duplicate, Junio.) On Thu, Aug 30, 2012 at 4:13 PM, Junio C Hamano wrote: > > In many scripted Porcelain commands, we find this idiom: > > if test "$(git rev-parse --verify A)" = "$(git merge-base A B)" > then > ... A is an ancestor of B ... >

Re: [PATCH 5/4] wincred: port to generic credential helper (UNTESTED)

2012-08-31 Thread Erik Faye-Lund
On Thu, Aug 30, 2012 at 8:27 PM, Erik Faye-Lund wrote: > On Mon, Aug 27, 2012 at 12:04 AM, Philipp A. Hartmann wrote: >> From: "Philipp A. Hartmann" >> >> This patch is an experiment to port the wincred helper >> to the generic implementation. As of know, it is >> completely untested. >> >> In

Re: GC of alternate object store

2012-08-31 Thread Oswald Buddenhagen
On Thu, Aug 30, 2012 at 09:03:34AM -0700, Junio C Hamano wrote: > Oswald Buddenhagen writes: > > >> Doesn't > >> > >>git push $over_there 'refs/*:refs/remotes/mine/*' > >> > >> push your tag v1.0 to refs/remotes/mine/v1.0 over there? The > >> version of git I ship seems to do this just fin

Re: [PATCH v3] Thunderbird: fix appp.sh format problems

2012-08-31 Thread Junio C Hamano
Marco Stornelli writes: > The current script has got the following problems: > > 1) It doesn't work if the language used by Thunderbird is not English; > 2) The field To: filled by format-patch is not evaluated; > 3) The field Cc: is loaded from Cc used in the commit message > instead of using th

Re: [PATCH v4] Thunderbird: fix appp.sh format problems

2012-08-31 Thread Junio C Hamano
Marco Stornelli writes: > The current script has got the following problems: > > 1) It doesn't work if the language used by Thunderbird is not english; > 2) The field To: filled by format-patch is not evaluated; > 3) The field Cc: is loaded from Cc used in the commit message > instead of using th

Re: [PATCH 1/3] branch: introduce --set-upstream-to

2012-08-31 Thread Junio C Hamano
Ralf Thielow writes: > On Fri, Aug 31, 2012 at 5:22 PM, Carlos Martín Nieto wrote: >> Ralf Thielow writes: >> >>> On Thu, Aug 30, 2012 at 7:23 PM, Carlos Martín Nieto wrote: behaviour. To work around this, introduce --set-upstream-to which accepts a compulsory argument indicating wha

rev-parse -q --verify with not existent upstream branch

2012-08-31 Thread Kacper Kornet
Documentation to git-rev-parse claims that -q, --quiet Only meaningful in --verify mode. Do not output an error message if the first argument is not a valid object name; instead exit with non-zero status silently. However when I try to check if the current branch has a configured upstr

Re: [PATCH 2/4] merge-base: "--is-ancestor A B"

2012-08-31 Thread Junio C Hamano
Martin von Zweigbergk writes: >> + if (argc != 2) >> + die("--is-ancestor takes exactly two commits"); > > I think git merge-base shows the usage message regardless if argc < 2, > so this only happens when more than two arguments are given. Yes, but it is a good discipline no

Re: Aw: Re: git blame shows wrong "Not commited yet" entries

2012-08-31 Thread Junio C Hamano
Thomas Ackermann writes: > The man-page for git-config says: > "core.ignorecase > If true, this option enables various workarounds to enable git to > work better on filesystems that are not case sensitive, like FAT. > For example, if a directory listing finds "makefile" when git > expects "Makefi

Re: (minor concern) git using the pager should not be a default

2012-08-31 Thread dag
Junio C Hamano writes: > In other words, Porcelain (roughly speaking, those that page by > default when their standard output is terminal), are not "command > line applications"; they have a layer on top with a built-in UI. Is "status" considered a plumbing layer command? Because I have often w

Re: [PATCH] t9164: More style fixes

2012-08-31 Thread Junio C Hamano
Robert Luberda writes: > Make sure t9164 conforms with the coding guidelines: > - remove spaces after redirection operators; > - insert spaces between function names and parentheses; > - split `if ...; then' lines; > - use `test' instead of `['. > > Signed-off-by: Robert Luberda > --- > t/t

Re: [PATCH 2/4] merge-base: "--is-ancestor A B"

2012-08-31 Thread Martin von Zweigbergk
On Fri, Aug 31, 2012 at 10:25 AM, Junio C Hamano wrote: > Martin von Zweigbergk writes: > >>> + if (argc != 2) >>> + die("--is-ancestor takes exactly two commits"); >> >> I think git merge-base shows the usage message regardless if argc < 2, >> so this only happens when more t

Re: (minor concern) git using the pager should not be a default

2012-08-31 Thread Andreas Schwab
writes: > Is "status" considered a plumbing layer command? Because I have often > wondered why it does not use the pager by default. I pipe it through > less all the time and it's kind of annoying that it works differently > than everything else. I would be pretty annoyed if git status would p

Re: [PATCH] checkout: warn users if action is taken in ambiguous situation

2012-08-31 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > "git checkout foo" (no more arguments) always checks out existing > branch "foo" even if "foo" exists on working directory. To avoid > confusion to users who do not know this exception, say something along > the action. I do not think the extra noise "Checked out

Re: [PATCH 2/4] merge-base: "--is-ancestor A B"

2012-08-31 Thread Junio C Hamano
Martin von Zweigbergk writes: > On Fri, Aug 31, 2012 at 10:25 AM, Junio C Hamano wrote: > ... >> I think "merge-base -h" will get this for free thanks to parseopt. > > It seems not, or maybe I'm using the wrong terminology; I meant to > include it in the first part of the below. > > usage: git m

Re: (minor concern) git using the pager should not be a default

2012-08-31 Thread Junio C Hamano
writes: > Junio C Hamano writes: > >> In other words, Porcelain (roughly speaking, those that page by >> default when their standard output is terminal), are not "command >> line applications"; they have a layer on top with a built-in UI. > > Is "status" considered a plumbing layer command? Hav

Re: GC of alternate object store

2012-08-31 Thread Dan Johnson
On Fri, Aug 31, 2012 at 12:26 PM, Oswald Buddenhagen wrote: > On Thu, Aug 30, 2012 at 09:03:34AM -0700, Junio C Hamano wrote: >> Oswald Buddenhagen writes: >> >> >> Doesn't >> >> >> >>git push $over_there 'refs/*:refs/remotes/mine/*' >> >> >> >> push your tag v1.0 to refs/remotes/mine/v1.0 ov

Re: GC of alternate object store

2012-08-31 Thread Junio C Hamano
Dan Johnson writes: > I believe that is bad interaction with "--all" (probably a bug). If I > am remembering correctly, --no-tags is internally a per-remote > setting, so I'm guessing it's not getting set on all remotes here. > > I'll look into this more a bit later tonight. Does fetch --no-tags

Re: [PATCH v4] Thunderbird: fix appp.sh format problems

2012-08-31 Thread Junio C Hamano
Marco Stornelli writes: > +PATCHTMP="${PATCH}.tmp" > + > +echo $MAILHEADER > $PATCHTMP > + > +export PATCHTMP > +CCS=`perl -e 'local $/=undef; open FILE, $ENV{'PATCHTMP'}; $text=; > +close FILE; $addr = $1 if $text =~ /Cc: (.*?(,\n .*?)*)\n/s; $addr =~ > s/\n//g; > +print $addr;'` > + > +TO=`per

Re: [PATCH] i18n: mark more index-pack strings for translation

2012-08-31 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > The main string I'm after is "completed with %d local objects", which > is part of typical UI. The rest is just "while at there..." > > To my surprise, (GNU) gettext does seem to know how to deal with > PRIu32 macro

Re: [PATCH v4] Thunderbird: fix appp.sh format problems

2012-08-31 Thread Johannes Sixt
Am 31.08.2012 16:09, schrieb Marco Stornelli: > +CCS=`perl -e 'local $/=undef; open FILE, $ENV{'PATCHTMP'}; $text=; > +close FILE; $addr = $1 if $text =~ /Cc: (.*?(,\n .*?)*)\n/s; $addr =~ > s/\n//g; > +print $addr;'` The quoting is broken in this line (sq within sq does not work). Am I correct

Re: (minor concern) git using the pager should not be a default

2012-08-31 Thread Jeff King
On Fri, Aug 31, 2012 at 08:09:34PM +0200, Andreas Schwab wrote: > writes: > > > Is "status" considered a plumbing layer command? Because I have often > > wondered why it does not use the pager by default. I pipe it through > > less all the time and it's kind of annoying that it works different

[PATCH] split_ident_line(): make best effort when parsing author/committer line

2012-08-31 Thread Junio C Hamano
Commits made by ancient version of Git allowed committer without human readable name, like this (00213b17c in the kernel history): tree 6947dba41f8b0e7fe7bccd41a4840d6de6a27079 parent 352dd1df32e672be4cff71132eb9c06a257872fe author Petr Baudis 1135223044 +0100 committer 11361510

Re: (minor concern) git using the pager should not be a default

2012-08-31 Thread dag
Jeff King writes: > if you really want it. As of 9bad723 (allow command-specific pagers in > pager., 2010-11-17), you can even set it to an arbitrary pager for > each git command. Cool! > With all those options, it's amazing that we can still have threads > about what should page. :) Well to b

Grafting Alternate History

2012-08-31 Thread dag
I have an unfortunate situation where I have two subversion repositories for the same project, one a public version and one a private version. Because they are mirrors of svn repositories, they have very different histories as far as git is concerned. This is not all that uncommon but of course I

[PATCH] fetch --all: pass --tags/--no-tags through to each remote

2012-08-31 Thread Dan Johnson
Reported-by: Oswald Buddenhagen Signed-off-by: Dan Johnson --- Junio C Hamano writes: >Dan Johnson writes: > >> I believe that is bad interaction with "--all" (probably a bug). If I >> am remembering correctly, --no-tags is internally a per-remote >> setting, so I'm guessing it's not getting s

[RFC] i18n.pathencoding

2012-08-31 Thread Torsten Bögershausen
Allow path names to be encoded in UTF-8 in the repository and checkout out as e.g. ISO-8859-1 in the working tree. Introduce a config variable i18n.pathEncoding. If empty, no re-encoding of path names is done. Add t3911 to test encoding back and forth The re-encoding is done in compat/reencode_p

Re: Grafting Alternate History

2012-08-31 Thread Andreas Schwab
writes: > For example, let's say we take a local copy of the private repository. > I would like to somehow create an empty branch in that local copy and > then populate it with the history of the public repository. I would > like to be able to specify a git diff-like command on the public graft