A good Git technique for referring back to original files

2013-02-12 Thread MikeW
Hi, I have a client with an SDK product. Normally the SDK is used in its unpackaged form by the end-user, and that is the directory structure and set of files in which development work on the SDK functionality is performed. However the SDK directory and content is generated from a packager which

Re: A good Git technique for referring back to original files

2013-02-12 Thread Matthieu Moy
MikeW mw_p...@yahoo.co.uk writes: Since git is so good at tracking file content, I wondered whether there was any technique using git that would simplify the back-referencing task. I'm not sure I understand the question, but if you want to add meta-data to Git commits (e.g. this Git commit

[RFC/PATCH] Replace filepattern with pathspec for consistency

2013-02-12 Thread Matthieu Moy
pathspec is the most widely used term, and is the one defined in gitglossary.txt. filepattern was used only in the synopsys for git-add and git-commit, and in git-add.txt. Get rid of it. This patch is obtained with by running: perl -pi -e 's/filepattern/pathspec/' `git grep -l filepattern`

[PATCH v3 1/4] git-count-objects.txt: describe each line in -v output

2013-02-12 Thread Nguyễn Thái Ngọc Duy
The current description requires a bit of guessing (what clause corresponds to what printed line?) and lacks information, such as the unit of size and size-pack. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Documentation/git-count-objects.txt | 20 +++- 1 file

[PATCH v3 2/4] sha1_file: reorder code in prepare_packed_git_one()

2013-02-12 Thread Nguyễn Thái Ngọc Duy
The current loop does while (...) { if (!not .idx file) continue; process .idx file; } and is reordered to while (...) { if (!.idx file) { process .idx file; }

[PATCH v3 3/4] count-objects: report garbage files in pack directory too

2013-02-12 Thread Nguyễn Thái Ngọc Duy
prepare_packed_git_one() is modified to allow count-objects to hook a report function to so we don't need to duplicate the pack searching logic in count-objects.c. When report_pack_garbage is NULL, the overhead is insignificant. The garbage is reported with warning() instead of error() in packed

[PATCH v3 4/4] count-objects: report how much disk space taken by garbage files

2013-02-12 Thread Nguyễn Thái Ngọc Duy
Also issue warnings on loose garbages instead of errors as a result of using report_garbage() function in count_objects() Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Documentation/git-count-objects.txt | 2 ++ builtin/count-objects.c | 21 + 2 files

[PATCH v3 0/4] count-objects improvements

2013-02-12 Thread Nguyễn Thái Ngọc Duy
Compared to v2 [1], this version - fixes sparse warning - restructures 2/3 (now 3/4) to make it easier to read - report path too long instead of garbage found in .git/path/too/long/pack-xxx.pack case - changes output prefix error: to warning: [1]

Re: [PATCH v2] rebase -i: respect core.commentchar

2013-02-12 Thread John Keeping
On Mon, Feb 11, 2013 at 04:13:31PM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: @@ -179,7 +182,9 @@ die_abort () { } has_action () { - sane_grep '^[^#]' $1 /dev/null + echo space stripped actions: 2 + git stripspace --strip-comments $1 2 +

[PATCH v4 00/12] unify appending of sob

2013-02-12 Thread Brandon Casey
Round 4. Interdiff against round 3 follows the diff stat. -Brandon Brandon Casey (9): commit, cherry-pick -s: remove broken support for multiline rfc2822 fields t/test-lib-functions.sh: allow to specify the tag name to test_commit t/t3511: add some tests of 'cherry-pick -s'

[PATCH v4 01/12] sequencer.c: rework search for start of footer to improve clarity

2013-02-12 Thread Brandon Casey
From: Jonathan Nieder jrnie...@gmail.com This code sequence is somewhat difficult to read. Let's rewrite it and add some comments to improve clarity. Signed-off-by: Brandon Casey draf...@gmail.com --- sequencer.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git

[PATCH v4 02/12] commit, cherry-pick -s: remove broken support for multiline rfc2822 fields

2013-02-12 Thread Brandon Casey
Starting with c1e01b0c (commit: More generous accepting of RFC-2822 footer lines, 2009-10-28), git commit -s carefully parses the last paragraph of each commit message to check if it consists only of RFC2822-style headers, in which case the signoff will be added as a new line in the same list:

[PATCH v4 03/12] t/test-lib-functions.sh: allow to specify the tag name to test_commit

2013-02-12 Thread Brandon Casey
The message part of test_commit() may not be appropriate for a tag name. So let's allow test_commit to accept a fourth argument to specify the tag name. Signed-off-by: Brandon Casey bca...@nvidia.com Reviewed-by: Jonathan Nieder jrnie...@gmail.com --- t/test-lib-functions.sh | 8 1 file

[PATCH v4 04/12] t/t3511: add some tests of 'cherry-pick -s' functionality

2013-02-12 Thread Brandon Casey
Add some tests to ensure that 'cherry-pick -s' operates in the following manner: * Inserts a blank line before appending a s-o-b to a commit message that does not contain a s-o-b footer * Does not mistake first line subject: description as a s-o-b footer * Does not mistake single

[PATCH v4 05/12] sequencer.c: recognize (cherry picked from ... as part of s-o-b footer

2013-02-12 Thread Brandon Casey
When 'cherry-pick -s' is used to append a signed-off-by line to a cherry picked commit, it does not currently detect the (cherry picked from... that may have been appended by a previous 'cherry-pick -x' as part of the s-o-b footer and it will insert a blank line before appending a new s-o-b.

[PATCH v4 06/12] sequencer.c: require a conforming footer to be preceded by a blank line

2013-02-12 Thread Brandon Casey
Currently, append_signoff() performs a search for the last line of the commit buffer by searching back from the end until it hits a newline. If it reaches the beginning of the buffer without finding a newline, that means either the commit message was empty, or there was only one line in it. In

[PATCH v4 07/12] sequencer.c: always separate (cherry picked from from commit body

2013-02-12 Thread Brandon Casey
Start treating the (cherry picked from line added by cherry-pick -x the same way that the s-o-b lines are treated. Namely, separate them from the main commit message body with an empty line. Introduce tests to test this functionality. Signed-off-by: Brandon Casey bca...@nvidia.com Reviewed-by:

[PATCH v4 08/12] sequencer.c: teach append_signoff how to detect duplicate s-o-b

2013-02-12 Thread Brandon Casey
Teach append_signoff how to detect a duplicate s-o-b in the commit footer. This is in preparation to unify the append_signoff implementations in log-tree.c and sequencer.c. Fixes test in t3511. Signed-off-by: Brandon Casey bca...@nvidia.com --- builtin/commit.c | 2 +- sequencer.c

[PATCH v4 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-12 Thread Brandon Casey
Teach append_signoff to detect whether a blank line exists at the position that the signed-off-by line will be added, and refrain from adding an additional one if one already exists. Or, add an additional line if one is needed to make sure the new footer is separated from the message body by a

[PATCH v4 10/12] t4014: more tests about appending s-o-b lines

2013-02-12 Thread Brandon Casey
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com [bc: Squash the tests from Duy's original unify-appending-sob series. Fix test 90 signoff: some random signoff-alike and mark as failing. Correct behavior should insert a blank line after message body and signed-off-by. Add two

[PATCH v4 11/12] format-patch: update append_signoff prototype

2013-02-12 Thread Brandon Casey
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com This is a preparation step for merging with append_signoff from sequencer.c Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Brandon Casey bca...@nvidia.com Reviewed-by: Jonathan Nieder jrnie...@gmail.com --- builtin/log.c | 13

[PATCH v4 12/12] Unify appending signoff in format-patch, commit and sequencer

2013-02-12 Thread Brandon Casey
There are two implementations of append_signoff in log-tree.c and sequencer.c, which do more or less the same thing. Unify on top of the sequencer.c implementation. Add a test in t4014 to demonstrate support for non-s-o-b elements in the commit footer provided by sequence.c:append_sob. Mark

[PATCH/FYI v4 13/12] fixup! t/t3511: add some tests of 'cherry-pick -s' functionality

2013-02-12 Thread Brandon Casey
--- This test tests the behavior of 'cherry-pick -s' of a commit with an empty commit message. I created the test when I noticed during my series that cherry-pick was adding a sob twice when a commit with an empty commit message was cherry-picked. I'm not sure we should apply this though. I'm

Re: A good Git technique for referring back to original files

2013-02-12 Thread MikeW
Matthieu Moy Matthieu.Moy at grenoble-inp.fr writes: MikeW mw_phil at yahoo.co.uk writes: Since git is so good at tracking file content, I wondered whether there was any technique using git that would simplify the back-referencing task. I'm not sure I understand the question, but if

[PATCH v4.1 09/12] sequencer.c: teach append_signoff to avoid adding a duplicate newline

2013-02-12 Thread Brandon Casey
Teach append_signoff to detect whether a blank line exists at the position that the signed-off-by line will be added, and refrain from adding an additional one if one already exists. Or, add an additional line if one is needed to make sure the new footer is separated from the message body by a

Re: Improve 'git help' with basic user guide linkss

2013-02-12 Thread Philip Oakley
From: Philip Oakley philipoak...@iee.org Sent: Friday, February 08, 2013 11:16 PM From: Junio C Hamano gits...@pobox.com Sent: Friday, February 08, 2013 10:54 PM Philip Oakley philipoak...@iee.org writes: My initial https://github.com/PhilipOakley/git/commit/e6217d simply updates - N_(See

Re: Pushing a git repository to a new server

2013-02-12 Thread Michael J Gruber
Jeff King venit, vidit, dixit 11.02.2013 17:27: On Mon, Feb 11, 2013 at 02:57:51AM -0500, Ethan Reesor wrote: On Mon, Feb 11, 2013 at 2:50 AM, Konstantin Khomoutov kostix+...@007spb.ru wrote: What's wrong with $ ssh myuser@remotehost 'mkdir /path/to/MyRepo.git; cd $_; git init --bare' $

Re: Improve 'git help' with basic user guide linkss

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 11:11:17AM -, Philip Oakley wrote: Obviously (?) this is generated from the command-list.txt file, though I don't see a shell script that would generate the 'cmds-mainporcelain.txt' (etc.) files (//github.com/gitster/git-htmldocs). They are also part of the

Re: Improve 'git help' with basic user guide linkss

2013-02-12 Thread Philip Oakley
From: John Keeping j...@keeping.me.uk Sent: Tuesday, February 12, 2013 11:37 AM On Tue, Feb 12, 2013 at 11:11:17AM -, Philip Oakley wrote: Obviously (?) this is generated from the command-list.txt file, though I don't see a shell script that would generate the 'cmds-mainporcelain.txt'

[PATCH] completion: support 'git config --local'

2013-02-12 Thread Matthieu Moy
This needs to be done in two places: __git_config_get_set_variables to allow clever completion of git config --local --get footab, and _git_config to allow git config --loctab to complete to --local. While we're there, change the order of options in the code to match git-config.txt.

[PATCHv4 4/6] Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz min...@mina86.com The command_close_bidi_pipe() function will insist on closing both input and output pipes returned by command_bidi_pipe(). With this change it is possible to close one of the pipes in advance and pass undef as an argument. Signed-off-by: Michal

[PATCHv4 6/6] git-send-email: use git credential to obtain password

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz min...@mina86.com If smtp_user is provided but smtp_pass is not, instead of prompting for password, make git-send-email use git credential command instead. Signed-off-by: Michal Nazarewicz min...@mina86.com --- Documentation/git-send-email.txt | 4 +--

[PATCHv4 0/6] git-credential support in git-send-email

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz min...@mina86.com Besids git-credential support in git-send-email, there are some other minor improvements to Git.pm in this patchset. Patch 3/6 is new compared to the previous patchset. Michal Nazarewicz (6): Git.pm: allow command_close_bidi_pipe to be called as

[PATCHv4 1/6] Git.pm: allow command_close_bidi_pipe to be called as method

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz min...@mina86.com The documentation of command_close_bidi_pipe() claims that it can be called as a method, but it does not check whether the first argument is $self or not assuming the latter. Using _maybe_self() fixes this. Signed-off-by: Michal Nazarewicz

[PATCHv4 5/6] Git.pm: add interface for git credential command

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz min...@mina86.com Add a credential() function which is an interface to the git credential command. The code is heavily based on credential_* functions in contrib/mw-to-git/git-remote-mediawiki. Signed-off-by: Michal Nazarewicz min...@mina86.com --- perl/Git.pm | 151

[PATCHv4 3/6] Git.pm: refactor command_close_bidi_pipe to use _cmd_close

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz min...@mina86.com The body of the loop in command_close_bidi_pipe function is identical to what _cmd_close function does so instead of duplicating, refactor change _cmd_close so that it accepts list of file handlers to be closed, which makes it usable with

[PATCHv4 2/6] Git.pm: fix example in command_close_bidi_pipe documentation

2013-02-12 Thread Michal Nazarewicz
From: Michal Nazarewicz min...@mina86.com Signed-off-by: Michal Nazarewicz min...@mina86.com --- perl/Git.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl/Git.pm b/perl/Git.pm index bbb753a..11f310a 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -418,7 +418,7 @@ and it

Re: Fwd: Re: [git-multimail] License unknown (#1)

2013-02-12 Thread Andy Parkins
On Tuesday 12 February 2013 09:01:14 Michael Haggerty wrote: I assume you are the Andy Parkins who originally submitted post-commit-email to the Git project... I am indeed. Hello. I have derived another script from yours: https://github.com/mhagger/git-multimail I affixed the

Re: [git-multimail] License unknown (#1)

2013-02-12 Thread Andy Parkins
On Sunday 27 January 2013 18:52:58 Michael Haggerty wrote: I have a question about the license of contrib/hooks/post-commit-email. I had assumed that since it is in the git project, which is GPLv2, and since it contains no contrary information, it would by implication also fall under GPLv2.

Re: [RFC/PATCH] Replace filepattern with pathspec for consistency

2013-02-12 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: pathspec is the most widely used term, and is the one defined in gitglossary.txt. filepattern was used only in the synopsys for git-add and git-commit, and in git-add.txt. Get rid of it. This patch is obtained with by running: perl -pi -e

Re: [RFC/PATCH] Replace filepattern with pathspec for consistency

2013-02-12 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: The strings that are fed to _() would be updated with your patch, but the replacement will stay to be filepattern translated to the target language. Translators have to actively hunt for the messages to update them. If you left the .po files

Re: [PATCH v4] submodule: add 'deinit' command

2013-02-12 Thread Phil Hord
I haven't tried it yet, but I have some comments. On Wed, Feb 6, 2013 at 4:11 PM, Jens Lehmann jens.lehm...@web.de wrote: With git submodule init the user is able to tell git he cares about one or more submodules and wants to have it populated on the next call to git submodule update. But

Re: [PATCH v3 3/4] count-objects: report garbage files in pack directory too

2013-02-12 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: +/* A hook for count-objects to report invalid files in pack directory */ +extern void (*report_garbage)(const char *desc, const char *path, int len, const char *name); We may want to document the strange way the last three parameters are used

Re: [PATCH v2] rebase -i: respect core.commentchar

2013-02-12 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: ... the following fixup is also needed to avoid relying on the shell emitting a literal backslash when a backslash isn't followed by a known escape character. -- 8 -- diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index

Re: [PATCH] completion: support 'git config --local'

2013-02-12 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: This needs to be done in two places: __git_config_get_set_variables to allow clever completion of git config --local --get footab, and _git_config to allow git config --loctab to complete to --local. While we're there, change the order of options in

Re: [PATCH v2] rebase -i: respect core.commentchar

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 09:29:26AM -0800, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: ... the following fixup is also needed to avoid relying on the shell emitting a literal backslash when a backslash isn't followed by a known escape character. -- 8 -- diff --git

Re: [PATCH v2] rebase -i: respect core.commentchar

2013-02-12 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: cat comment-lines.sh EOF #!$SHELL_PATH -sed -e 2,\$ s/^/\\/ \$1 \$1.tmp +sed -e 2,\$ s/^// \$1 \$1.tmp mv \$1.tmp \$1 EOF chmod a+x comment-lines.sh Yeek. If you used write_script with here-text that does not

Re: [PATCH v4] submodule: add 'deinit' command

2013-02-12 Thread Junio C Hamano
Phil Hord phil.h...@gmail.com writes: + if test $# = 0 + then + die $(eval_gettext Use '.' if you really want to deinitialize all submodules) + fi + + module_list $@ | + while read mode sha1 stage sm_path + do +

Re: [RFC/PATCH] Replace filepattern with pathspec for consistency

2013-02-12 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: The strings that are fed to _() would be updated with your patch, but the replacement will stay to be filepattern translated to the target language. Translators have to actively hunt for the messages

Re: [PATCH v2] rebase -i: respect core.commentchar

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 10:00:26AM -0800, Junio C Hamano wrote: So it needs to be more like this, and I think it still is more readable. Agreed. Will you squash this in or do you want a re-roll? diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index

Re: [PATCH v2] rebase -i: respect core.commentchar

2013-02-12 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: I am not sure if I understand what you meant by literal backslash blah blah, though. It turns out that having this in the script works (in bash and dash although I haven't checked what Posix has to say about it): sed -e 2,$ s/^/\\\/ and is

Re: [PATCH v2] rebase -i: respect core.commentchar

2013-02-12 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Tue, Feb 12, 2013 at 10:00:26AM -0800, Junio C Hamano wrote: So it needs to be more like this, and I think it still is more readable. Agreed. Will you squash this in or do you want a re-roll? I can squash this and the previous one into your

RE: Fetch and -t

2013-02-12 Thread Olsen, Alan R
[Sorry for the top-posting. I *hate* Outlook.] I will need to check why my system is showing old man pages. I am running something compiled from the git tree on kernel.org. Thanks! -Original Message- From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Monday, February 11, 2013 6:25

Re: [PATCHv4 3/6] Git.pm: refactor command_close_bidi_pipe to use _cmd_close

2013-02-12 Thread Junio C Hamano
Michal Nazarewicz m...@google.com writes: From: Michal Nazarewicz min...@mina86.com The body of the loop in command_close_bidi_pipe function is identical to what _cmd_close function does so instead of duplicating, refactor change _cmd_close so that it accepts list of file handlers to be

Re: [PATCH v4 05/12] sequencer.c: recognize (cherry picked from ... as part of s-o-b footer

2013-02-12 Thread Junio C Hamano
Brandon Casey draf...@gmail.com writes: When 'cherry-pick -s' is used to append a signed-off-by line to a cherry picked commit, it does not currently detect the (cherry picked from... that may have been appended by a previous 'cherry-pick -x' as part of the s-o-b footer and it will insert a

Re: [PATCH v4 11/12] format-patch: update append_signoff prototype

2013-02-12 Thread Junio C Hamano
Brandon Casey draf...@gmail.com writes: From: Nguyễn Thái Ngọc Duy pclo...@gmail.com This is a preparation step for merging with append_signoff from sequencer.c Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Brandon Casey bca...@nvidia.com Reviewed-by: Jonathan

Re: [PATCH v4 05/12] sequencer.c: recognize (cherry picked from ... as part of s-o-b footer

2013-02-12 Thread Brandon Casey
On 2/12/2013 11:13 AM, Junio C Hamano wrote: Brandon Casey draf...@gmail.com writes: When 'cherry-pick -s' is used to append a signed-off-by line to a cherry picked commit, it does not currently detect the (cherry picked from... that may have been appended by a previous 'cherry-pick -x' as

Re: [PATCH v4 05/12] sequencer.c: recognize (cherry picked from ... as part of s-o-b footer

2013-02-12 Thread Junio C Hamano
Brandon Casey bca...@nvidia.com writes: + return len strlen(cherry_picked_prefix) + 1 + !prefixcmp(buf, cherry_picked_prefix) buf[len - 1] == ')'; +} Does the first is it longer than the prefix? check matter? If it is not, prefixcmp() would not match anyway, no? Probably

Re: [PATCH v4 05/12] sequencer.c: recognize (cherry picked from ... as part of s-o-b footer

2013-02-12 Thread Jonathan Nieder
Brandon Casey wrote: On 2/12/2013 11:13 AM, Junio C Hamano wrote: Brandon Casey draf...@gmail.com writes: +static int is_cherry_picked_from_line(const char *buf, int len) +{ + /* +* We only care that it looks roughly like (cherry picked from ...) +*/ + return len

Re: [PATCH v4 05/12] sequencer.c: recognize (cherry picked from ... as part of s-o-b footer

2013-02-12 Thread Brandon Casey
On 2/12/2013 11:36 AM, Junio C Hamano wrote: Brandon Casey bca...@nvidia.com writes: + return len strlen(cherry_picked_prefix) + 1 + !prefixcmp(buf, cherry_picked_prefix) buf[len - 1] == ')'; +} Does the first is it longer than the prefix? check matter? If it is not,

Re: [PATCH/FYI v4 13/12] fixup! t/t3511: add some tests of 'cherry-pick -s' functionality

2013-02-12 Thread Jonathan Nieder
Brandon Casey wrote: I'm not sure we should apply this though. I'm leaning towards saying that the 'cherry-pick -s' behavior with respect to a commit with an empty message body should be undefined. If we want it to be undefined then we probably shouldn't introduce a test which would have

Re: [PATCH v4 05/12] sequencer.c: recognize (cherry picked from ... as part of s-o-b footer

2013-02-12 Thread Junio C Hamano
Brandon Casey bca...@nvidia.com writes: On 2/12/2013 11:36 AM, Junio C Hamano wrote: Brandon Casey bca...@nvidia.com writes: + return len strlen(cherry_picked_prefix) + 1 + !prefixcmp(buf, cherry_picked_prefix) buf[len - 1] == ')'; +} Does the first is it longer than the

[PATCH 0/2] Add bash.showUntrackedFiles config option

2013-02-12 Thread Martin Erik Werner
Hi, Here is a patch adding a config option for showing untracked files in the shell prompt, I've noticed having it enabled tends to make the prompt act very sluggish in some cases (large repos / unfriendly filesystems). So it would be nice to have a more fine-grained control over it, similar to

[PATCH 2/2] t9903: add test case for bash.showUntrackedFiles

2013-02-12 Thread Martin Erik Werner
Add a test case for the bash.showUntrackedFiles config option, which checks that the config option can disable the global effect of the GIT_PS1_SHOWUNTRACKEDFILES environmant variable. Signed-off-by: Martin Erik Werner martinerikwer...@gmail.com --- t/t9903-bash-prompt.sh | 11 +++ 1

[PATCH 1/2] bash completion: add bash.showUntrackedFiles option

2013-02-12 Thread Martin Erik Werner
Add a config option 'bash.showUntrackedFiles' which allows enabling the prompt showing untracked files on a per-repository basis. This is useful for some repositories where the 'git ls-files ...' command may take a long time. Signed-off-by: Martin Erik Werner martinerikwer...@gmail.com ---

Re: [PATCH v4 00/12] unify appending of sob

2013-02-12 Thread Jonathan Nieder
Brandon Casey wrote: Round 4. Yay. I think this is cooked now and a good foundation for later changes on top. For what it's worth, with or without the two tweaks Junio suggested (simplifying (cherry picked from detection, deferring introduction of no_dup_sob variable until it is used),

Re: [PATCH/FYI v4 13/12] fixup! t/t3511: add some tests of 'cherry-pick -s' functionality

2013-02-12 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Brandon Casey wrote: I'm not sure we should apply this though. I'm leaning towards saying that the 'cherry-pick -s' behavior with respect to a commit with an empty message body should be undefined. If we want it to be undefined then we probably

[PATCH 1/3] Documentation/Makefile: fix spaces around assignments

2013-02-12 Thread John Keeping
A simple style fix; no functional change. Signed-off-by: John Keeping j...@keeping.me.uk --- Documentation/Makefile | 42 +- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index

[PATCH 0/3] Fix installation paths with make install-doc

2013-02-12 Thread John Keeping
When using the top-level install-doc target the html, info and man target directories are inherited from the top-level Makefile by the documentation Makefile as relative paths, which is not expected and results in the files being installed in an unexpected location. The first two patches are

[PATCH 3/3] Documentation/Makefile: fix inherited {html,info,man}dir

2013-02-12 Thread John Keeping
Commit e14421b (Allow INSTALL, bindir, mandir to be set in main Makefile - 2006-06-29) changed Documentation/Makefile to inherit the value of mandir from the top-level Makefile when invoked as make install-doc at the top-level. This was inherited by infodir and htmldir when they were added. This

[PATCH 2/3] Documentation/Makefile: move infodir to be with other '*dir's

2013-02-12 Thread John Keeping
Signed-off-by: John Keeping j...@keeping.me.uk --- Documentation/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index af3d8a4..0cfdc36 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -81,6 +81,7 @@

Re: Pushing a git repository to a new server

2013-02-12 Thread Jeff King
On Tue, Feb 12, 2013 at 12:28:53PM +0100, Michael J Gruber wrote: I'm not sure providers like GitHub would fancy an interface which allows the programmatic creation of repos (giving a new meaning to fork bomb). But I bet you know better ;-) You can already do that:

Re: [PATCH v4 00/12] unify appending of sob

2013-02-12 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Brandon Casey wrote: Round 4. Yay. I think this is cooked now and a good foundation for later changes on top. For what it's worth, with or without the two tweaks Junio suggested (simplifying (cherry picked from detection, deferring introduction

Re: [PATCHv4 3/6] Git.pm: refactor command_close_bidi_pipe to use _cmd_close

2013-02-12 Thread Jeff King
On Tue, Feb 12, 2013 at 10:55:05AM -0800, Junio C Hamano wrote: Michal Nazarewicz m...@google.com writes: From: Michal Nazarewicz min...@mina86.com The body of the loop in command_close_bidi_pipe function is identical to what _cmd_close function does so instead of duplicating, refactor

Re: inotify to minimize stat() calls

2013-02-12 Thread Karsten Blees
Am 11.02.2013 04:53, schrieb Duy Nguyen: On Sun, Feb 10, 2013 at 11:58 PM, Erik Faye-Lund kusmab...@gmail.com wrote: Karsten Blees has done something similar-ish on Windows, and he posted the results here: https://groups.google.com/forum/#!topic/msysgit/fL_jykUmUNE/discussion The new

Re: [PATCHv4 4/6] Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-12 Thread Jeff King
On Tue, Feb 12, 2013 at 03:02:31PM +0100, Michal Nazarewicz wrote: sub command_close_bidi_pipe { local $?; my ($self, $pid, $in, $out, $ctx) = _maybe_self(@_); - _cmd_close($ctx, $in, $out); + _cmd_close($ctx, grep defined, $in, $out); Maybe it is just me, but I find

Re: [PATCH 1/3] Documentation/Makefile: fix spaces around assignments

2013-02-12 Thread Jonathan Nieder
Hi, John Keeping wrote: [Subject: [PATCH 1/3] Documentation/Makefile: fix spaces around assignments] It's not so much fix spaces as use consistent spacing, no? Aside from that nit, looks like a sensible no-op to me, so Reviewed-by: Jonathan Nieder jrnie...@gmail.com Thanks. -- To unsubscribe

Re: [PATCH 2/3] Documentation/Makefile: move infodir to be with other '*dir's

2013-02-12 Thread Jonathan Nieder
John Keeping wrote: Signed-off-by: John Keeping j...@keeping.me.uk [...] --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -81,6 +81,7 @@ DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT)) prefix ?= $(HOME) bindir ?= $(prefix)/bin htmldir ?= $(prefix)/share/doc/git-doc +infodir ?=

Re: [PATCH] completion: support 'git config --local'

2013-02-12 Thread Jeff King
On Tue, Feb 12, 2013 at 09:34:39AM -0800, Junio C Hamano wrote: I see the second hunk is new. Comments? [...] @@ -1676,7 +1676,7 @@ _git_config () case $cur in --*) __gitcomp - --global --system --file= + --system --global

Re: [PATCHv4 3/6] Git.pm: refactor command_close_bidi_pipe to use _cmd_close

2013-02-12 Thread Michal Nazarewicz
Michal Nazarewicz m...@google.com writes: The body of the loop in command_close_bidi_pipe function is identical to what _cmd_close function does so instead of duplicating, refactor change _cmd_close so that it accepts list of file handlers to be closed, which On Tue, Feb 12, 2013 at

Re: [PATCHv4 4/6] Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-12 Thread Michal Nazarewicz
On Tue, Feb 12 2013, Jeff King wrote: On Tue, Feb 12, 2013 at 03:02:31PM +0100, Michal Nazarewicz wrote: sub command_close_bidi_pipe { local $?; my ($self, $pid, $in, $out, $ctx) = _maybe_self(@_); -_cmd_close($ctx, $in, $out); +_cmd_close($ctx, grep defined, $in, $out);

Re: [PATCHv4 4/6] Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Feb 12, 2013 at 03:02:31PM +0100, Michal Nazarewicz wrote: sub command_close_bidi_pipe { local $?; my ($self, $pid, $in, $out, $ctx) = _maybe_self(@_); -_cmd_close($ctx, $in, $out); +_cmd_close($ctx, grep defined, $in, $out);

Re: [PATCHv4 3/6] Git.pm: refactor command_close_bidi_pipe to use _cmd_close

2013-02-12 Thread Junio C Hamano
Michal Nazarewicz min...@mina86.com writes: Michal Nazarewicz m...@google.com writes: The body of the loop in command_close_bidi_pipe function is identical to what _cmd_close function does so instead of duplicating, refactor change _cmd_close so that it accepts list of file handlers to be

Re: [PATCHv4 4/6] Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-12 Thread Jeff King
On Tue, Feb 12, 2013 at 01:14:57PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: On Tue, Feb 12, 2013 at 03:02:31PM +0100, Michal Nazarewicz wrote: sub command_close_bidi_pipe { local $?; my ($self, $pid, $in, $out, $ctx) = _maybe_self(@_); - _cmd_close($ctx,

Re: [PATCH 2/3] Documentation/Makefile: move infodir to be with other '*dir's

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 01:01:38PM -0800, Jonathan Nieder wrote: John Keeping wrote: Signed-off-by: John Keeping j...@keeping.me.uk [...] --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -81,6 +81,7 @@ DOC_MAN7 = $(patsubst %.txt,%.7,$(MAN7_TXT)) prefix ?= $(HOME)

Re: [PATCH] completion: support 'git config --local'

2013-02-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: I'm not sure I understand the original poster's point about git config -l --local. -l does not take a limiter, does it? git config -l core.\* will just die without limiting the output to everything under core. hierarchy, so you are right---the combination does

Re: [PATCH 1/2] bash completion: add bash.showUntrackedFiles option

2013-02-12 Thread Junio C Hamano
Martin Erik Werner martinerikwer...@gmail.com writes: Add a config option 'bash.showUntrackedFiles' which allows enabling the prompt showing untracked files on a per-repository basis. This is useful for some repositories where the 'git ls-files ...' command may take a long time.

Re: [PATCH 0/3] Fix installation paths with make install-doc

2013-02-12 Thread Jonathan Nieder
John Keeping wrote: Documentation/Makefile: fix inherited {html,info,man}dir This doesn't seem to have hit the list. Thanks, Jonathan -- 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

Re: [PATCH 2/2] t9903: add test case for bash.showUntrackedFiles

2013-02-12 Thread Junio C Hamano
Martin Erik Werner martinerikwer...@gmail.com writes: Add a test case for the bash.showUntrackedFiles config option, which checks that the config option can disable the global effect of the GIT_PS1_SHOWUNTRACKEDFILES environmant variable. Signed-off-by: Martin Erik Werner

Re: [PATCH 0/3] Fix installation paths with make install-doc

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 02:25:08PM -0800, Jonathan Nieder wrote: John Keeping wrote: Documentation/Makefile: fix inherited {html,info,man}dir This doesn't seem to have hit the list. Hmm... it made it to gmane: http://article.gmane.org/gmane.comp.version-control.git/216188 -- To

Re: [PATCH 0/3] Fix installation paths with make install-doc

2013-02-12 Thread Jonathan Nieder
John Keeping wrote: On Tue, Feb 12, 2013 at 02:25:08PM -0800, Jonathan Nieder wrote: John Keeping wrote: Documentation/Makefile: fix inherited {html,info,man}dir This doesn't seem to have hit the list. Hmm... it made it to gmane:

Re: [PATCH 0/3] Fix installation paths with make install-doc

2013-02-12 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: John Keeping wrote: Documentation/Makefile: fix inherited {html,info,man}dir This doesn't seem to have hit the list. More importantly, When using the top-level install-doc target the html, info and man target directories are inherited from

Re: [PATCHv4 4/6] Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-12 Thread Michal Nazarewicz
On Tue, Feb 12 2013, Junio C Hamano wrote: I would actually vote for the most explicit: _cmd_close($ctx, (grep { defined } ($in, $out))); To me that looks weird at best, but I don't have strong opinions on that matter. -- Best regards, _ _

Re: [PATCH v4 11/12] format-patch: update append_signoff prototype

2013-02-12 Thread Brandon Casey
On Tue, Feb 12, 2013 at 11:29 AM, Junio C Hamano gits...@pobox.com wrote: Brandon Casey draf...@gmail.com writes: diff --git a/builtin/log.c b/builtin/log.c index 8f0b2e8..59de484 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -253,9 +255,12 @@ static int detect_any_signoff(char

Re: [PATCH 0/3] Fix installation paths with make install-doc

2013-02-12 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: I _think_ exporting mandir/html/infodir from the top-level Makefile is wrong to begin with. We should drop the export mandir from there. Ah, it is this thing, isn't it? commit d8cf908cb6012cd4dc3d1089a849daf646150c2e Author: Junio C Hamano

Re: [PATCH 0/3] Fix installation paths with make install-doc

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 02:45:34PM -0800, Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: John Keeping wrote: Documentation/Makefile: fix inherited {html,info,man}dir This doesn't seem to have hit the list. More importantly, When using the top-level

Re: [PATCH 0/3] Fix installation paths with make install-doc

2013-02-12 Thread John Keeping
On Tue, Feb 12, 2013 at 02:57:25PM -0800, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: I _think_ exporting mandir/html/infodir from the top-level Makefile is wrong to begin with. We should drop the export mandir from there. Ah, it is this thing, isn't it? commit

[PATCH] Makefile: do not export mandir/htmldir/infodir

2013-02-12 Thread Junio C Hamano
These are defined in the main Makefile to be funny values that are optionally relative to an unspecified location that is determined at runtime. They are only suitable for hardcoding in the binary via the -DGIT_{MAN,HTML,INFO}_PATH=value C preprocessor options, and are not real paths, contrary to

Re: A good Git technique for referring back to original files

2013-02-12 Thread Paul Campbell
Hi Mike, I think git-cvsimport and git-subtree could help you here. Roughly: # Create a git version of each SDK_subproj git cvsimport -r upstream -d $CVSREPO1 $CVSMODULE1 -C SDK_subproj1 git cvsimport -r upstream -d $CVSREPO2 $CVSMODULE2 -C SDK_subproj2 # Create your Working_SDK git init

Re: [PATCH 0/3] Fix installation paths with make install-doc

2013-02-12 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: Looks like it - I tried this for the first time today (with pu) so I didn't realise it was a recent change, and I didn't think to blame the export line. Unfortunately that bogus change is already in 'next', but luckily we caught it before it graduated

  1   2   >