Re: [PATCHv2 01/12] git p4 test: remove bash-ism of combined export/assignment
Luke Diamand l...@diamand.org writes: Looks good to me, ack. Thanks; is this an ack for the entire series, or are you expecting further back-and-forth with Pete before the whole thing is ready? -- 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 http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Add userdiff patterns for Ada
Adrian Johnson ajohn...@redneon.com writes: Add Ada xfuncname and wordRegex patterns to the list of builtin patterns. Signed-off-by: Adrian Johnson ajohn...@redneon.com --- Interesting. I do not read Ada, but in this expect file,... diff --git a/t/t4034/ada/expect b/t/t4034/ada/expect new file mode 100644 index 000..be2376e --- /dev/null +++ b/t/t4034/ada/expect @@ -0,0 +1,27 @@ +BOLDdiff --git a/pre b/postRESET +BOLDindex d96fdd1..df21bb0 100644RESET +BOLD--- a/preRESET +BOLD+++ b/postRESET +CYAN@@ -1,13 +1,13 @@RESET +Ada.Text_IO.Put_Line(Hello WorldRED!RESETGREEN?RESET); +1 1eRED-RESET10 16#FE12#E2 3.141_592 'REDxRESETGREENyRESET' +REDaRESETGREENxRESET+REDb aRESETGREENy xRESET-REDbRESET +REDaRESETGREENyRESET +GREENxRESET*REDb aRESETGREENy xRESET/REDbRESET +REDaRESETGREENyRESET +GREENxRESET**REDbRESET +REDaRESETGREENyRESET +GREENxRESET(REDbRESETGREENyRESET) +REDaRESETGREENxRESET:=REDbRESET +REDaRESETGREENyRESET +GREENxRESET=REDb aRESETGREENy xRESET/= REDbRESET +REDaRESETGREENyRESET +GREENxRESETREDb aRESETGREENy xRESET=REDb aRESETGREENy xRESETREDb aRESETGREENy xRESET=REDbRESET +REDaRESETGREENyRESET +GREENxRESET,REDbRESET +REDaRESETGREENyRESET +GREENxRESET=REDbRESET +REDaRESETGREENyRESET +GREENxRESET..REDbRESET +REDaRESETGREENyRESET +GREENxRESETREDbRESETGREENyRESET I do not seem to find anything interesting after @@, which means that xfuncname is not tested at all even though the log message claims the patch adds some. Puzzled... -- 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 http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/3] rebase -i: Add tests for --edit-todo
Andrew Wong andrew.k...@gmail.com writes: Signed-off-by: Andrew Wong andrew.k...@gmail.com --- t/t3404-rebase-interactive.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 7304b66..a194c97 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -911,4 +911,20 @@ test_expect_success 'rebase -i --root fixup root commit' ' test 0 = $(git cat-file commit HEAD | grep -c ^parent\ ) ' +test_expect_success 'rebase --edit-todo does not works on non-interactive rebase' ' + git checkout conflict-branch + test_must_fail git rebase --onto HEAD~2 HEAD~ + test_must_fail git rebase --edit-todo + git rebase --abort +' It _might_ be that you simply inherited sloppiness from surrounding existing tests, but what happens when a test _before_ this test failed? Is git checkout conflict-branch sufficient to bring you to a sensible state where this test would succeed? I'd prefer to see a defensive git reset --hard before the first checkout. The same for the next one. +test_expect_success 'rebase --edit-todo can be used to modify todo' ' + git checkout no-conflict-branch^0 + FAKE_LINES=edit 1 2 3 git rebase -i HEAD~3 + FAKE_LINES=2 1 git rebase --edit-todo + git rebase --continue + test M = $(git cat-file commit HEAD^ | sed -ne \$p) + test L = $(git cat-file commit HEAD | sed -ne \$p) +' + test_done -- 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 http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Add userdiff patterns for Ada
On 16/09/12 15:37, Junio C Hamano wrote: Adrian Johnson ajohn...@redneon.com writes: Add Ada xfuncname and wordRegex patterns to the list of builtin patterns. Signed-off-by: Adrian Johnson ajohn...@redneon.com --- Interesting. I do not read Ada, but in this expect file,... diff --git a/t/t4034/ada/expect b/t/t4034/ada/expect new file mode 100644 index 000..be2376e --- /dev/null +++ b/t/t4034/ada/expect @@ -0,0 +1,27 @@ +BOLDdiff --git a/pre b/postRESET +BOLDindex d96fdd1..df21bb0 100644RESET +BOLD--- a/preRESET +BOLD+++ b/postRESET +CYAN@@ -1,13 +1,13 @@RESET +Ada.Text_IO.Put_Line(Hello WorldRED!RESETGREEN?RESET); +1 1eRED-RESET10 16#FE12#E2 3.141_592 'REDxRESETGREENyRESET' +REDaRESETGREENxRESET+REDb aRESETGREENy xRESET-REDbRESET +REDaRESETGREENyRESET +GREENxRESET*REDb aRESETGREENy xRESET/REDbRESET +REDaRESETGREENyRESET +GREENxRESET**REDbRESET +REDaRESETGREENyRESET +GREENxRESET(REDbRESETGREENyRESET) +REDaRESETGREENxRESET:=REDbRESET +REDaRESETGREENyRESET +GREENxRESET=REDb aRESETGREENy xRESET/= REDbRESET +REDaRESETGREENyRESET +GREENxRESETREDb aRESETGREENy xRESET=REDb aRESETGREENy xRESETREDb aRESETGREENy xRESET=REDbRESET +REDaRESETGREENyRESET +GREENxRESET,REDbRESET +REDaRESETGREENyRESET +GREENxRESET=REDbRESET +REDaRESETGREENyRESET +GREENxRESET..REDbRESET +REDaRESETGREENyRESET +GREENxRESETREDbRESETGREENyRESET I do not seem to find anything interesting after @@, which means that xfuncname is not tested at all even though the log message claims the patch adds some. I probably misunderstood how the tests work. I thought t4034 tested wordRegex while t4018 is for xfuncname. I based the Ada tests on the Pascal tests but changed the operators to Ada operators. I'm not really sure what else the test needs. Puzzled... -- 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 http://vger.kernel.org/majordomo-info.html -- 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 http://vger.kernel.org/majordomo-info.html
Backlight control broken between 3.6.0-rc1 and 3.6.0-rc4
I have a Dell XPS 13 Ultrabook laptop. Backlight control used to be broken, it works in 3.6.0-rc1, and it is broken again in 3.6.0-rc4. - Grant -- 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 http://vger.kernel.org/majordomo-info.html
Re: [PATCHv2 01/12] git p4 test: remove bash-ism of combined export/assignment
On 16/09/12 07:05, Junio C Hamano wrote: Luke Diamandl...@diamand.org writes: Looks good to me, ack. Thanks; is this an ack for the entire series, or are you expecting further back-and-forth with Pete before the whole thing is ready? An ack for the whole series. I'm just going through the rest of the patches now but I don't expect to find any issues. -- 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 http://vger.kernel.org/majordomo-info.html
RE: Unable to clone GIT project
Can anyone please help me out. -Original Message- From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On Behalf Of Aggarwal, Ankush Sent: Sunday, September 16, 2012 8:49 AM To: git@vger.kernel.org Subject: Unable to clone GIT project I have created a GIT repository on Linux 64 bit machine. When I tried to clone GIT repository on windows 7 machine then I am getting below error. Error: git-upload-pack: error while loading shared libraries: libiconv.so.2: cannot open shared object file: No such file or directory fatal: The remote end hung up unexpectedly anyone please help me resolve the issue. Regards, Ankush -- 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 http://vger.kernel.org/majordomo-info.html -- 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 http://vger.kernel.org/majordomo-info.html
[PATCH 5/8] Doc: separate gitignore pattern sources
Use separate bulleted paragraphs for the three different gitignore pattern sources. Signed-off-by: Philip Oakley philipoak...@iee.org diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index c1f692a..1a585e7 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -41,18 +41,24 @@ precedence, the last matching pattern decides the outcome): variable 'core.excludesfile'. Which file to place a pattern in depends on how the pattern is meant to -be used. Patterns which should be version-controlled and distributed to -other repositories via clone (i.e., files that all developers will want -to ignore) should go into a `.gitignore` file. Patterns which are -specific to a particular repository but which do not need to be shared -with other related repositories (e.g., auxiliary files that live inside -the repository but are specific to one user's workflow) should go into -the `$GIT_DIR/info/exclude` file. Patterns which a user wants git to -ignore in all situations (e.g., backup or temporary files generated by -the user's editor of choice) generally go into a file specified by -`core.excludesfile` in the user's `~/.gitconfig`. Its default value is -$XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or empty, -$HOME/.config/git/ignore is used instead. +be used. + + * Patterns which should be version-controlled and distributed to + other repositories via clone (i.e., files that all developers will want + to ignore) should go into a `.gitignore` file. + + * Patterns which are + specific to a particular repository but which do not need to be shared + with other related repositories (e.g., auxiliary files that live inside + the repository but are specific to one user's workflow) should go into + the `$GIT_DIR/info/exclude` file. + + * Patterns which a user wants git to + gnore in all situations (e.g., backup or temporary files generated by + the user's editor of choice) generally go into a file specified by + `core.excludesfile` in the user's `~/.gitconfig`. Its default value is + $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or + empty, $HOME/.config/git/ignore is used instead. The underlying git plumbing tools, such as 'git ls-files' and 'git read-tree', read -- 1.7.8.msysgit.0 -- 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 http://vger.kernel.org/majordomo-info.html
[PATCH 0/8] Small documentation updates
This, my first patch series, adds small documentation updates covering points I had noticed or had to research elsewhere. The small 'git' update applies on top of Junio's changes in 'next'. e.g. http://article.gmane.org/gmane.comp.version-control.git/204794 Philip Philip Oakley (8): Doc: Bundle file usage Doc: shallow clone deepens _to_ new depth Doc: Improve shallow depth wording Doc: 'git' has a discussion section Doc: separate gitignore pattern sources Doc add: link gitignore Doc clean: add See Also links Doc branch: show -vv option and alternative Documentation/fetch-options.txt |3 +- Documentation/git-add.txt |3 +- Documentation/git-branch.txt |5 ++- Documentation/git-bundle.txt | 16 -- Documentation/git-clean.txt |6 + Documentation/git.txt |1 + Documentation/gitignore.txt | 30 +--- Documentation/technical/pack-protocol.txt |8 -- Documentation/urls.txt|3 ++ 9 files changed, 49 insertions(+), 26 deletions(-) -- 1.7.8.msysgit.0 -- 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 http://vger.kernel.org/majordomo-info.html
status of git interop with other VCS
Hi all, I thought I would summarise current status of interop between git and other remote VCSen. In particular I am interested in good git remote helpers for cvs, svn, hg, darcs and bzr. git-svn and the like are useful but git remote helpers are better because they map everything onto the git model better. cvs: there seems to have been a project but it was never merged: http://marc.info/?l=gitm=127279549623477w=2 http://thread.gmane.org/gmane.comp.version-control.git/131620/focus=131632 svn: there was a gsoc project for this but it was never merged: http://git.wiki.kernel.org/index.php/SoC2011Projects#Remote_helper_for_Subversion_and_git-svn hg: there are a few projects for this, none are merged: git://github.com/SRabbelier/git.git http://marc.info/?l=gitm=134153749521450w=2 darcs: can't find any project to add this, please let me know of one bzr: git-remote-bzr is part of bzr-git but it is quite buggy, hopefully this will improve over time though. -- bye, pabs http://bonedaddy.net/pabs3/ signature.asc Description: This is a digitally signed message part
Re: [PATCH 7/8] Doc clean: add See Also links
Philip Oakley philipoak...@iee.org writes: --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.txt @@ -63,6 +63,12 @@ OPTIONS Remove only files ignored by git. This may be useful to rebuild everything from scratch, but keep manually created files. +SEE ALSO + +linkgit:gitignore[5] +linkgit:gitrepository-layout[5] +The optional configuration variable `core.excludesfile` linkgit:git-config[1] I think linkgit:gitignore[5] is enough. linkgit:gitrepository-layout[5] is a very general documentation, it's not clear to the reader which part is intended to be read in complement to git-clean, and indeed, the relevant information is already in linkgit:gitignore[5]. Same for core.excludesfile which is already documented in linkgit:gitignore[5]. Otherwise, I suspect we'll end-up having the transitive closure of SEE ALSO in each manpage ... -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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 http://vger.kernel.org/majordomo-info.html
[PATCH 8/8] Doc branch: show -vv option and alternative
Indicate that the -v option can be given twice in the short options. Without it users pass over the option. Also indicate the alternate 'git remote show' method. Signed-off-by: Philip Oakley philipoak...@iee.org --- the option to show where a branch's remote is located should not be buried within an option. diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 9c1d2f1..cc7f54c 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -130,12 +130,13 @@ This option is only applicable in non-verbose mode. Activate the list mode. `git branch pattern` would try to create a branch, use `git branch --list pattern` to list matching branches. --v:: +-v, -vv:: --verbose:: When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print - the name of the upstream branch, as well. + the name of the upstream branch, as well (see also `git remote + show remote`). -q:: --quiet:: -- 1.7.8.msysgit.0 -- 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 http://vger.kernel.org/majordomo-info.html
[PATCH 2/8] Doc: shallow clone deepens _to_ new depth
Clarify that 'depth=' specifies the new depth from the remote's branch tip. It does not add the depth to the existing shallow clone. (details from pack-protocol.txt). Clarify that tags are not fetched. (details from shallow.txt) Signed-off-by: Philip Oakley philipoak...@iee.org diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 39d326a..b4d6476 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -10,7 +10,8 @@ --depth=depth:: Deepen the history of a 'shallow' repository created by `git clone` with `--depth=depth` option (see linkgit:git-clone[1]) - by the specified number of commits. + to the specified number of commits from the tip of each remote + branch history. Tags for the deepened commits are not fetched. ifndef::git-pull[] --dry-run:: -- 1.7.8.msysgit.0 -- 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 http://vger.kernel.org/majordomo-info.html
[PATCH 6/8] Doc add: link gitignore
Include the gitignore link with the paired gitrepository- layout link. Signed-off-by: Philip Oakley philipoak...@iee.org --- without the gitignore link users are unlikely to realise the significance of the repository layout link, nor what to look for within it diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 9c1d395..311be9a 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -155,7 +155,8 @@ Configuration The optional configuration variable `core.excludesfile` indicates a path to a file containing patterns of file names to exclude from git-add, similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to -those in info/exclude. See linkgit:gitrepository-layout[5]. +those in info/exclude. See linkgit:gitrepository-layout[5] and +linkgit:gitignore[5]. EXAMPLES -- 1.7.8.msysgit.0 -- 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 http://vger.kernel.org/majordomo-info.html
[PATCH 4/8] Doc: 'git' has a discussion section
Highlight there is a further discussion section later in git man page Signed-off-by: Philip Oakley philipoak...@iee.org diff --git a/Documentation/git.txt b/Documentation/git.txt index 34d8a1b..56685c7 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -30,6 +30,7 @@ After you mastered the basic concepts, you can come back to this page to learn what commands git offers. You can learn more about individual git commands with git help command. linkgit:gitcli[7] manual page gives you an overview of the command line command syntax. +See also the Discussion and Further Documentation sections below. Formatted and hyperlinked version of the latest git documentation can be viewed at `http://git-htmldocs.googlecode.com/git/git.html`. -- 1.7.8.msysgit.0 -- 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 http://vger.kernel.org/majordomo-info.html
[PATCH 3/8] Doc: Improve shallow depth wording
Avoid confusion in compound sentence about the start of the commit set and the depth measure. Use two sentences. Signed-off-by: Philip Oakley philipoak...@iee.org diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt index 49cdc57..fa4acab 100644 --- a/Documentation/technical/pack-protocol.txt +++ b/Documentation/technical/pack-protocol.txt @@ -258,9 +258,11 @@ a positive depth, this step is skipped. unshallow-line = PKT-LINE(unshallow SP obj-id) -If the client has requested a positive depth, the server will compute -the set of commits which are no deeper than the desired depth, starting -at the client's wants. The server writes 'shallow' lines for each +If the client has requested a positive depth the server will compute +the set of commits which are no deeper than the desired depth. The set +of commits start at the client's wants. + +The server writes 'shallow' lines for each commit whose parents will not be sent as a result. The server writes an 'unshallow' line for each commit which the client has indicated is shallow, but is no longer shallow at the currently requested depth -- 1.7.8.msysgit.0 -- 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 http://vger.kernel.org/majordomo-info.html
[PATCH 1/8] Doc: Bundle file usage
Git URLs can accept bundle files for fetch, pull and clone, include in that section. Include git clone in the bundle usage description. Correct the quoting of git-rev-list-args. Detail the git-rev-list-args '--all' option for cloning. Signed-off-by: Philip Oakley philipoak...@iee.org --- This follows from my question: http://stackoverflow.com/questions/11792671/how-to-git-bundle-a-complete-repo and thinking about what I misunderstood in the man page. diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt index 16a6b0a..be6a5f1 100644 --- a/Documentation/git-bundle.txt +++ b/Documentation/git-bundle.txt @@ -21,12 +21,12 @@ Some workflows require that one or more branches of development on one machine be replicated on another machine, but the two machines cannot be directly connected, and therefore the interactive git protocols (git, ssh, rsync, http) cannot be used. This command provides support for -'git fetch' and 'git pull' to operate by packaging objects and references -in an archive at the originating machine, then importing those into -another repository using 'git fetch' and 'git pull' -after moving the archive by some means (e.g., by sneakernet). As no -direct connection between the repositories exists, the user must specify a -basis for the bundle that is held by the destination repository: the +'git fetch', 'git pull' and 'git clone', to operate by packaging +objects and references in an archive at the originating machine, then +importing those into another repository using 'git fetch', 'git pull', +or 'git clone', after moving the archive by some means (e.g., by sneakernet). +As no direct connection between the repositories exists, the user must +specify a basis for the bundle that is held by the destination repository: the bundle assumes that all objects in the basis are already in the destination repository. @@ -35,7 +35,7 @@ OPTIONS create file:: Used to create a bundle named 'file'. This requires the - 'git-rev-list-args' arguments to define the bundle contents. + git-rev-list-args arguments to define the bundle contents. verify file:: Used to check that a bundle file is valid and will apply @@ -92,6 +92,8 @@ It is okay to err on the side of caution, causing the bundle file to contain objects already in the destination, as these are ignored when unpacking at the destination. +To create a bundle for 'git clone', use `--all` for the git-rev-list-args. + EXAMPLE --- diff --git a/Documentation/urls.txt b/Documentation/urls.txt index 2890194..2d75cce 100644 --- a/Documentation/urls.txt +++ b/Documentation/urls.txt @@ -42,6 +42,9 @@ These two syntaxes are mostly equivalent, except the former implies --local option. endif::git-clone[] +'git clone', 'git fetch' and 'git pull', but not 'git push', will also +accept a suitable bundle file. See linkgit:git-bundle[1]. + When git doesn't know how to handle a certain transport protocol, it attempts to use the 'remote-transport' remote helper, if one exists. To explicitly request a remote helper, the following syntax -- 1.7.8.msysgit.0 -- 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 http://vger.kernel.org/majordomo-info.html
[PATCH v2 0/5] Support matching ** in .gitattributes and .gitignore
Changes in v2: - Correct commit sha-1 in the 1/5 to the last GPL-2 rsync commit. State it is pristine import. Move wildmatch.[ch] to top dir. - Add tests to 5/5 (I forgot to test that the integration should run well, in addition to wildmatch() working in general) Note that there might be a regression because wildmatch() does not care about LC_CTYPE when dealing with character classes, while libc's fnmatch might. But it's probably not worth bothering about because we match against path names, which do not necessarily follow LC_TYPE but the file system's encoding. Nguyễn Thái Ngọc Duy (5): Import wildmatch from rsync compat/wildmatch: remove static variable force_lower_case compat/wildmatch: fix case-insensitive matching Integrate wildmatch to git Support ** in .gitignore and .gitattributes patterns using wildmatch() .gitignore | 1 + Documentation/gitignore.txt| 3 + Makefile | 6 + attr.c | 4 +- dir.c | 5 +- t/t0003-attributes.sh | 17 ++ t/t3001-ls-files-others-exclude.sh | 11 ++ t/t3070-wildmatch.sh | 27 +++ t/t3070-wildmatch/wildtest.txt | 165 test-wildmatch.c | 228 +++ wildmatch.c| 373 + wildmatch.h| 6 + 12 files changed, 844 insertions(+), 2 deletions(-) create mode 100755 t/t3070-wildmatch.sh create mode 100644 t/t3070-wildmatch/wildtest.txt create mode 100644 test-wildmatch.c create mode 100644 wildmatch.c create mode 100644 wildmatch.h -- 1.7.12.403.gce5cf6f.dirty -- 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 http://vger.kernel.org/majordomo-info.html
[PATCH v2 1/5] Import wildmatch from rsync
These files are from rsync.git commit f92f5b166e3019db42bc7fe1aa2f1a9178cd215d, which was the last commit before rsync turned GPL-3. All files are imported as-is and no-op. Adaptation is done in a separate patch. rsync.git - git.git lib/wildmatch.[ch] wildmatch.[ch] wildtest.c test-wildmatch.c wildtest.txtt/t3070-wildmatch/wildtest.txt Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- t/t3070-wildmatch/wildtest.txt | 165 ++ test-wildmatch.c | 222 + wildmatch.c| 368 + wildmatch.h| 6 + 4 files changed, 761 insertions(+) create mode 100644 t/t3070-wildmatch/wildtest.txt create mode 100644 test-wildmatch.c create mode 100644 wildmatch.c create mode 100644 wildmatch.h diff --git a/t/t3070-wildmatch/wildtest.txt b/t/t3070-wildmatch/wildtest.txt new file mode 100644 index 000..42c1678 --- /dev/null +++ b/t/t3070-wildmatch/wildtest.txt @@ -0,0 +1,165 @@ +# Input is in the following format (all items white-space separated): +# +# The first two items are 1 or 0 indicating if the wildmat call is expected to +# succeed and if fnmatch works the same way as wildmat, respectively. After +# that is a text string for the match, and a pattern string. Strings can be +# quoted (if desired) in either double or single quotes, as well as backticks. +# +# MATCH FNMATCH_SAME text to match 'pattern to use' + +# Basic wildmat features +1 1 foofoo +0 1 foobar +1 1 '' +1 1 foo??? +0 1 foo?? +1 1 foo* +1 1 foof* +0 1 foo*f +1 1 foo*foo* +1 1 foobar *ob*a*r* +1 1 aaabababab *ab +1 1 foo* foo\* +0 1 foobar foo\*bar +1 1 f\oo f\\oo +1 1 ball *[al]? +0 1 ten[ten] +1 1 ten**[!te] +0 1 ten**[!ten] +1 1 tent[a-g]n +0 1 tent[!a-g]n +1 1 tont[!a-g]n +1 1 tont[^a-g]n +1 1 a]ba[]]b +1 1 a-ba[]-]b +1 1 a]ba[]-]b +0 1 aaba[]-]b +1 1 aaba[]a-]b +1 1 ] ] + +# Extended slash-matching features +0 1 foo/baz/barfoo*bar +1 1 foo/baz/barfoo**bar +0 1 foo/barfoo?bar +0 1 foo/barfoo[/]bar +0 1 foo/barf[^eiu][^eiu][^eiu][^eiu][^eiu]r +1 1 foo-barf[^eiu][^eiu][^eiu][^eiu][^eiu]r +0 1 foo**/foo +1 1 /foo **/foo +1 1 bar/baz/foo**/foo +0 1 bar/baz/foo*/foo +0 0 foo/bar/baz**/bar* +1 1 deep/foo/bar/baz **/bar/* +0 1 deep/foo/bar/baz/ **/bar/* +1 1 deep/foo/bar/baz/ **/bar/** +0 1 deep/foo/bar **/bar/* +1 1 deep/foo/bar/ **/bar/** +1 1 foo/bar/baz**/bar** +1 1 foo/bar/baz/x */bar/** +0 0 deep/foo/bar/baz/x */bar/** +1 1 deep/foo/bar/baz/x **/bar/*/* + +# Various additional tests +0 1 acrt a[c-c]st +1 1 acrt a[c-c]rt +0 1 ] [!]-] +1 1 a [!]-] +0 1 '' \ +0 1 \ \ +0 1 /\ */\ +1 1 /\ */\\ +1 1 foofoo +1 1 @foo @foo +0 1 foo@foo +1 1 [ab] \[ab] +1 1 [ab] [[]ab] +1 1 [ab] [[:]ab] +0 1 [ab] [[::]ab] +1 1 [ab] [[:digit]ab] +1 1 [ab] [\[:]ab] +1 1 ?a?b \??\?b +1 1 abc\a\b\c +0 1 foo'' +1 1 foo/bar/baz/to **/t[o] + +# Character class tests +1 1 a1B[[:alpha:]][[:digit:]][[:upper:]] +0 1 a [[:digit:][:upper:][:space:]] +1 1 A [[:digit:][:upper:][:space:]] +1 1 1 [[:digit:][:upper:][:space:]] +0 1 1 [[:digit:][:upper:][:spaci:]] +1 1 ' '[[:digit:][:upper:][:space:]] +0 1 . [[:digit:][:upper:][:space:]] +1 1 . [[:digit:][:punct:][:space:]] +1 1 5 [[:xdigit:]] +1 1 f [[:xdigit:]] +1 1 D [[:xdigit:]] +1 1 _ [[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]] +#1 1 � [^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]] +1 1 [^[:alnum:][:alpha:][:blank:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]] +1 1 .
[PATCH v2 2/5] compat/wildmatch: remove static variable force_lower_case
One place less to worry about thread safety
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
wildmatch.c | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/wildmatch.c b/wildmatch.c
index f3a1731..e824eb2 100644
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -57,11 +57,10 @@
int wildmatch_iteration_count;
#endif
-static int force_lower_case = 0;
-
/* Match pattern p against the a virtually-joined string consisting
* of text and any strings in array a. */
-static int dowild(const uchar *p, const uchar *text, const uchar*const *a)
+static int dowild(const uchar *p, const uchar *text,
+ const uchar*const *a, int force_lower_case)
{
uchar p_ch;
@@ -121,7 +120,7 @@ static int dowild(const uchar *p, const uchar *text, const
uchar*const *a)
t_ch = *text;
continue;
}
- if ((matched = dowild(p, text, a)) != FALSE) {
+ if ((matched = dowild(p, text, a, force_lower_case)) != FALSE) {
if (!special || matched != ABORT_TO_STARSTAR)
return matched;
} else if (!special t_ch == '/')
@@ -291,7 +290,7 @@ int wildmatch(const char *pattern, const char *text)
#ifdef WILD_TEST_ITERATIONS
wildmatch_iteration_count = 0;
#endif
-return dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
+return dowild((const uchar*)pattern, (const uchar*)text, nomore, 0) ==
TRUE;
}
/* Match the pattern against the forced-to-lower-case text string. */
@@ -302,9 +301,7 @@ int iwildmatch(const char *pattern, const char *text)
#ifdef WILD_TEST_ITERATIONS
wildmatch_iteration_count = 0;
#endif
-force_lower_case = 1;
-ret = dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
-force_lower_case = 0;
+ret = dowild((const uchar*)pattern, (const uchar*)text, nomore, 1) == TRUE;
return ret;
}
@@ -331,7 +328,7 @@ int wildmatch_array(const char *pattern, const char*const
*texts, int where)
if (!text)
return FALSE;
-if ((matched = dowild(p, text, a)) != TRUE where 0
+if ((matched = dowild(p, text, a, 0)) != TRUE where 0
matched != ABORT_ALL) {
while (1) {
if (*text == '\0') {
@@ -339,7 +336,7 @@ int wildmatch_array(const char *pattern, const char*const
*texts, int where)
return FALSE;
continue;
}
- if (*text++ == '/' (matched = dowild(p, text, a)) != FALSE
+ if (*text++ == '/' (matched = dowild(p, text, a, 0)) != FALSE
matched != ABORT_TO_STARSTAR)
break;
}
--
1.7.12.403.gce5cf6f.dirty
--
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 http://vger.kernel.org/majordomo-info.html
[PATCH] completion: add --no-edit to git-commit
Signed-off-by: Yacine Belkadi yacine.belkad...@gmail.com --- contrib/completion/git-completion.bash |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 1b43329..be800e0 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1018,7 +1018,8 @@ _git_commit () --*) __gitcomp --all --author= --signoff --verify --no-verify - --edit --amend --include --only --interactive + --edit --no-edit + --amend --include --only --interactive --dry-run --reuse-message= --reedit-message= --reset-author --file= --message= --template= --cleanup= --untracked-files --untracked-files= -- 1.7.9.5 -- 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 http://vger.kernel.org/majordomo-info.html
[PATCH v2 1/3] rebase -i: Refactor help messages for todo file
Signed-off-by: Andrew Wong andrew.k...@gmail.com
---
git-rebase--interactive.sh | 31 ---
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a09e842..4d57e50 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -115,6 +115,23 @@ mark_action_done () {
fi
}
+append_todo_help () {
+ cat $todo EOF
+#
+# Commands:
+# p, pick = use commit
+# r, reword = use commit, but edit the commit message
+# e, edit = use commit, but stop for amending
+# s, squash = use commit, but meld into previous commit
+# f, fixup = like squash, but discard this commit's log message
+# x, exec = run command (the rest of the line) using shell
+#
+# These lines can be re-ordered; they are executed from top to bottom.
+#
+# If you remove a line here THAT COMMIT WILL BE LOST.
+EOF
+}
+
make_patch () {
sha1_and_parents=$(git rev-list --parents -1 $1)
case $sha1_and_parents in
@@ -901,18 +918,10 @@ test -n $cmd add_exec_commands $todo
cat $todo EOF
# Rebase $shortrevisions onto $shortonto
+EOF
+append_todo_help
+cat $todo EOF
#
-# Commands:
-# p, pick = use commit
-# r, reword = use commit, but edit the commit message
-# e, edit = use commit, but stop for amending
-# s, squash = use commit, but meld into previous commit
-# f, fixup = like squash, but discard this commit's log message
-# x, exec = run command (the rest of the line) using shell
-#
-# These lines can be re-ordered; they are executed from top to bottom.
-#
-# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
EOF
--
1.7.12.318.g79683ba.dirty
--
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 http://vger.kernel.org/majordomo-info.html
Re: Remove all files except a few files, using filter-branch
Yi, EungJun semtlen...@gmail.com writes: Hi, all. I want to remove all files except a few files, in the history of my git repository. I tried to do that as follows: git filter-branch --index-filter git rm --cached --ignore-unmatch $(git ls-files | grep -v '^filename$' | tr '\n' ' ') Try instead first removing all files, then restoring the files you want to keep. --index-filter git rm --cached -qr -- . git reset -q -- filename Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something completely different. -- 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 http://vger.kernel.org/majordomo-info.html
Re: [PATCH 7/8] Doc clean: add See Also links
On 16/09/12 13:08, Matthieu Moy wrote: Philip Oakley philipoak...@iee.org writes: --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.txt @@ -63,6 +63,12 @@ OPTIONS Remove only files ignored by git. This may be useful to rebuild everything from scratch, but keep manually created files. +SEE ALSO + +linkgit:gitignore[5] +linkgit:gitrepository-layout[5] +The optional configuration variable `core.excludesfile` linkgit:git-config[1] I think linkgit:gitignore[5] is enough. linkgit:gitrepository-layout[5] is a very general documentation, it's not clear to the reader which part is intended to be read in complement to git-clean, and indeed, the relevant information is already in linkgit:gitignore[5]. Same for core.excludesfile which is already documented in linkgit:gitignore[5]. Otherwise, I suspect we'll end-up having the transitive closure of SEE ALSO in each manpage ... I'd added all three partly because of the git add link which went first to the repository layout which didn't help me much without the extra link. In fact I've lost a patch (a mistaken rebase todo list possibly) to make the three git ignore pattern types more obvious in the documentation, which would probably cover your point. -- 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 http://vger.kernel.org/majordomo-info.html
Re: Unable to clone GIT project
On Sun, Sep 16, 2012 at 12:46 PM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Sun, Sep 16, 2012 at 03:19:25AM +, ankush_aggar...@dell.com wrote: I have created a GIT repository on Linux 64 bit machine. When I tried to clone GIT repository on windows 7 machine then I am getting below error. Error: git-upload-pack: error while loading shared libraries: libiconv.so.2: cannot open shared object file: No such file or directory fatal: The remote end hung up unexpectedly anyone please help me resolve the issue. See [1] and generally search google for msysgit+libiconv.so.2 as it contains links to other approaches to working around this problem. Note that questions about technical issues with Git for Windows are better asked on the msysgit mailing list [2] or in the project bug tracker [3] (after searching both places for the relevant information). No. This is not a Git for Windows issue. The remote end is the one who isn't able to load libiconv, you can tell from the fact that it complains about libiconv.so.2, not libiconv-2.dll, and from the fact that the client informs us that the remote end hung up. Ankush: There's something wrong with the setup on your Linux machine; most likely something related to the library path set up. What protocol are you cloning over? -- 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 http://vger.kernel.org/majordomo-info.html
[PATCH] git-jump: ignore (custom) prefix in diff mode
Matching the default file prefix b/ does not yield any results if config
option diff.noprefix or diff.mnemonicprefix is enabled.
Signed-off-by: Mischa POSLAWSKY g...@shiar.nl
---
Very useful script otherwise; thanks.
contrib/git-jump/git-jump | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git contrib/git-jump/git-jump contrib/git-jump/git-jump
index a33674e..dc90cd6 100755
--- contrib/git-jump/git-jump
+++ contrib/git-jump/git-jump
@@ -21,9 +21,9 @@ open_editor() {
}
mode_diff() {
- git diff --relative $@ |
+ git diff --no-prefix --relative $@ |
perl -ne '
- if (m{^\+\+\+ b/(.*)}) { $file = $1; next }
+ if (m{^\+\+\+ (.*)}) { $file = $1; next }
defined($file) or next;
if (m/^@@ .*\+(\d+)/) { $line = $1; next }
defined($line) or next;
--
1.7.12.165.g8cb9d9c
--
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 http://vger.kernel.org/majordomo-info.html
Re: [PATCH] git-jump: ignore (custom) prefix in diff mode
diff --git contrib/git-jump/git-jump contrib/git-jump/git-jump index a33674e..dc90cd6 100755 --- contrib/git-jump/git-jump +++ contrib/git-jump/git-jump Apparently diff.noprefix also applies to git format-patch. Even though git am does explicitly support -p0, I would argue against diff options creating non-standard patches. -- 8 -- Subject: [PATCH/RFC] format-patch: force default file prefixes in diff Override user configuration (eg. diff.noprefix) in patches intended for external consumption to match the default prefixes expected by git-am. Signed-off-by: Mischa POSLAWSKY g...@shiar.nl --- builtin/log.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/log.c b/builtin/log.c index dff7921..91ded25 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1131,6 +1131,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) rev.diff = 1; rev.max_parents = 1; DIFF_OPT_SET(rev.diffopt, RECURSIVE); + rev.diffopt.a_prefix = a/; + rev.diffopt.b_prefix = b/; rev.subject_prefix = fmt_patch_subject_prefix; memset(s_r_opt, 0, sizeof(s_r_opt)); s_r_opt.def = HEAD; -- 1.7.12.166.ga54f379 -- 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 http://vger.kernel.org/majordomo-info.html
Re: [PATCHv4] clone --single: limit the fetch refspec to fetched branch
Ralf Thielow ralf.thie...@gmail.com writes: - add tests for the refspec installed by the clone command Thanks. +test_expect_success 'refspec contains all branches by default' ' + git clone file://$PWD dir_all There have been numerous on windows which should we use, $PWD or $(pwd)? gotchas. In this particular case, wouldn't the tests work equally well with . to avoid the uneasiness factor? + echo +refs/heads/*:refs/remotes/origin/* expected + git --git-dir=dir_all/.git config --get remote.origin.fetch actual + test_cmp expected actual I am a bit torn with this one. We'd want to make sure a single clone from a repository with two branches will not result in a repository where the next fetch will not pull in the other branch, and the value of the remote.origin.fetch is an implementation detail that happen to be what affects the outcome. The test is not checking the expected outcome in a direct way (imagine how this test will break when we do another change similar to the migration from .git/remotes/origin to the remote.origin.fetch variables). I'll let it pass for now, though. +test_expect_success 'no refspec is written if remotes HEAD is detached' ' + git checkout two^ + git clone --single-branch file://$PWD dir_detached + rm expected touch expected If earlier tests failed, there may not be any expected file and the rm expected will fail. You can just say expected instead. touch is a way to update the timestamp of the file; do not use it when you want to make sure an empty file exists. + git --git-dir=dir_detached/.git config --get remote.origin.fetch actual + test_cmp expected actual +' I'd feel better if the test were like this instead: git checkout two^ git clone --single-branch . dir_detached ( cd dir_detached git fetch git for-each-ref refs/remotes/origin actual ) expect test_cmp expect actual That is what I would call testing the desired results in the most direct way. Perhaps like this? -- 8 -- t5709-clone-refspec.sh -- 8 -- #!/bin/sh test_description='test refspec written by clone-command' . ./test-lib.sh test_expect_success 'setup' ' # Make two branches, master and side echo one file git add file git commit -m one echo two file git commit -a -m two git tag two echo three file git commit -a -m three git checkout -b side echo four file git commit -a -m four git checkout master # default clone git clone . dir_all # default --single that follows HEAD=master git clone --single-branch . dir_master # default --single that follows HEAD=side git checkout side git clone --single-branch . dir_side # explicit --single that follows side git checkout master git clone --single-branch --branch side . dir_side2 # --single that does not know what branch to follow git checkout two^ git clone --single-branch . dir_detached # advance both master and side branches git checkout side echo five file git commit -a -m five git checkout master echo six file git commit -a -m six ' test_expect_success 'by default all branches will be kept updated' ' ( cd dir_all git fetch git for-each-ref refs/remotes/origin | sed -e /HEAD$/d \ -e s|/remotes/origin/|/heads/| ../actual ) # follow both master and side git for-each-ref refs/heads expect test_cmp expect actual ' test_expect_success '--single-branch while HEAD pointing at master' ' ( cd dir_master git fetch git for-each-ref refs/remotes/origin | sed -e /HEAD$/d \ -e s|/remotes/origin/|/heads/| ../actual ) # only follow master git for-each-ref refs/heads/master expect test_cmp expect actual ' test_expect_success '--single-branch while HEAD pointing at side' ' ( cd dir_side git fetch git for-each-ref refs/remotes/origin | sed -e /HEAD$/d \ -e s|/remotes/origin/|/heads/| ../actual ) # only follow side git for-each-ref refs/heads/side expect test_cmp expect actual ' test_expect_success '--single-branch with explicit --branch side' ' ( cd dir_side2 git fetch git for-each-ref refs/remotes/origin | sed -e /HEAD$/d \ -e s|/remotes/origin/|/heads/| ../actual ) # only follow side git for-each-ref refs/heads/side expect test_cmp expect actual ' test_expect_success
Re: [PATCHv2 01/12] git p4 test: remove bash-ism of combined export/assignment
Luke Diamand l...@diamand.org writes: On 16/09/12 07:05, Junio C Hamano wrote: Luke Diamandl...@diamand.org writes: Looks good to me, ack. Thanks; is this an ack for the entire series, or are you expecting further back-and-forth with Pete before the whole thing is ready? An ack for the whole series. I'm just going through the rest of the patches now but I don't expect to find any issues. As long as the parties involved in the part of the system can agree that this series is basically sound, I'd be happy to merge it down. Minor issues can be fixed up as follow-up patches. Thanks. Will merge it to 'next'. -- 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 http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Add userdiff patterns for Ada
Adrian Johnson ajohn...@redneon.com writes: I do not seem to find anything interesting after @@, which means that xfuncname is not tested at all even though the log message claims the patch adds some. I probably misunderstood how the tests work. I thought t4034 tested wordRegex while t4018 is for xfuncname. I based the Ada tests on the Pascal tests but changed the operators to Ada operators. I'm not really sure what else the test needs. The per-language for-loop you added ada to in t4018 is only to make sure there is no regexp syntax error in the built-in xfuncname, and does not check if the patterns make sense for the language at all. You could add test vectors to check if the built-in xfuncname catches beginning of functions in Ada correctly if you wanted to, but I think observing what appears on @@ lines in t4034 test vector would be a sufficient test. -- 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 http://vger.kernel.org/majordomo-info.html
Re: [PATCH 7/8] Doc clean: add See Also links
Matthieu Moy matthieu@grenoble-inp.fr writes: Philip Oakley philipoak...@iee.org writes: --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.txt @@ -63,6 +63,12 @@ OPTIONS Remove only files ignored by git. This may be useful to rebuild everything from scratch, but keep manually created files. +SEE ALSO + +linkgit:gitignore[5] +linkgit:gitrepository-layout[5] +The optional configuration variable `core.excludesfile` linkgit:git-config[1] I think linkgit:gitignore[5] is enough. linkgit:gitrepository-layout[5] is a very general documentation, it's not clear to the reader which part is intended to be read in complement to git-clean, and indeed, the relevant information is already in linkgit:gitignore[5]. Same for core.excludesfile which is already documented in linkgit:gitignore[5]. Otherwise, I suspect we'll end-up having the transitive closure of SEE ALSO in each manpage ... Concurred. Thanks. -- 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 http://vger.kernel.org/majordomo-info.html
Re: [PATCH] completion: add --no-edit to git-commit
thanks. -- 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 http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Documentation: indent-with-non-tab uses tabwidth setting, not just 8
Wesley J. Landaker w...@icecavern.net writes: From: Wesley J. Landaker w...@icecavern.net Update the documentation of the core.whitespace option indent-with-non-tab to correctly reflect that it uses the currently set tab width, set by the tabwidth option, rather than a fixed number. Signed-off-by: Wesley J. Landaker w...@icecavern.net --- Documentation/config.txt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 6416cae..113a196 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -559,8 +559,8 @@ core.whitespace:: * `space-before-tab` treats a space character that appears immediately before a tab character in the initial indent part of the line as an error (enabled by default). -* `indent-with-non-tab` treats a line that is indented with 8 or more - space characters as an error (not enabled by default). +* `indent-with-non-tab` treats a line that is indented with `tabwidth` space + characters or more as an error (not enabled by default). I would rather see this part left untouched. Your new text will force people who are not interested in using non-standard tab width to read through the bulletted list, only to find The default tab width is 8. I think that is a regression in the documentation for more common readers. When somebody wants to use `indent-with-non-tab` and gets offended by the seemingly hardcoded 8 in the description, the reader has incentive to find out if there is a way to change that 8, and will find `tabwidth=n` in the same bulletted list described, with the effect it has on both `indent-with-non-tab` and `tab-in-indent`. I think that should be sufficient for people who do use non-standard tab width using tabwidth=n. -- 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 http://vger.kernel.org/majordomo-info.html
Re: [PATCH] git-jump: ignore (custom) prefix in diff mode
Mischa POSLAWSKY g...@shiar.nl writes: diff --git contrib/git-jump/git-jump contrib/git-jump/git-jump index a33674e..dc90cd6 100755 --- contrib/git-jump/git-jump +++ contrib/git-jump/git-jump Apparently diff.noprefix also applies to git format-patch. Even though git am does explicitly support -p0, I would argue against diff options creating non-standard patches. -- 8 -- Subject: [PATCH/RFC] format-patch: force default file prefixes in diff Override user configuration (eg. diff.noprefix) in patches intended for external consumption to match the default prefixes expected by git-am. Signed-off-by: Mischa POSLAWSKY g...@shiar.nl --- Not all projects expect to see a/ b/ prefix and these are configurable for a reason. Robbing the choice that has been supported for quite a long time from them is an unacceptable regression. Why did you think this may be a good idea in the first place? Perhaps you had configured your diff.noprefix in a wrong configuration file? This is primarily per-project choice, and your clone of git.git should not have diff.noprefix set, neither your $HOME/.gitconfig unless you always work on projects that want diff.noprefix. builtin/log.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/log.c b/builtin/log.c index dff7921..91ded25 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1131,6 +1131,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) rev.diff = 1; rev.max_parents = 1; DIFF_OPT_SET(rev.diffopt, RECURSIVE); + rev.diffopt.a_prefix = a/; + rev.diffopt.b_prefix = b/; rev.subject_prefix = fmt_patch_subject_prefix; memset(s_r_opt, 0, sizeof(s_r_opt)); s_r_opt.def = HEAD; -- 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 http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 4/5] Integrate wildmatch to git
Junio C Hamano gits...@pobox.com writes: Am I missing some includes? test-wildmatch.c:50: error: array type has incomplete element type test-wildmatch.c:52: error: 'POPT_ARG_NONE' undeclared here (not in a function) test-wildmatch.c:53: error: 'POPT_ARG_STRING' undeclared here (not in a function) test-wildmatch.c:54: error: 'POPT_ARG_INT' undeclared here (not in a function) test-wildmatch.c: In function 'main': test-wildmatch.c:122: error: 'poptContext' undeclared (first use in this function) test-wildmatch.c:122: error: (Each undeclared identifier is reported only once test-wildmatch.c:122: error: for each function it appears in.) test-wildmatch.c:122: error: expected ';' before 'pc' cc1: warnings being treated as errors test-wildmatch.c:125: error: implicit declaration of function 'poptGetNextOpt' test-wildmatch.c:125: error: 'pc' undeclared (first use in this function) test-wildmatch.c:128: error: implicit declaration of function 'poptGetOptArg' test-wildmatch.c:139: error: implicit declaration of function 'poptBadOption' test-wildmatch.c:139: error: 'POPT_BADOPTION_NOALIAS' undeclared (first use in this function) test-wildmatch.c:140: error: implicit declaration of function 'poptStrerror' test-wildmatch.c:148: error: implicit declaration of function 'poptGetArgs' Yeah, popt.h it is. It is a bit distasteful that we have a build dependency only to build test-* helper on something that we do not even have runtime dependency on. -- 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 http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 4/5] Integrate wildmatch to git
On Mon, Sep 17, 2012 at 12:54 PM, Junio C Hamano gits...@pobox.com wrote: Yeah, popt.h it is. It is a bit distasteful that we have a build dependency only to build test-* helper on something that we do not even have runtime dependency on. Yep. I don't know how popular libpopt is. But if it's undesired, we could rewrite test-wildmatch.c to use parse-options.c instead. We fork from rsync anyway due to license conflict so we don't have to keep it close to upstream any more. -- Duy -- 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 http://vger.kernel.org/majordomo-info.html
