Re: [PATCH 3/3] t/t7106-reset-unborn-branch.sh: Add PERL prerequisite

Jonathan Nieder writes: > Kacper Kornet wrote: > >> Signed-off-by: Kacper Kornet > > Thanks. > > Reviewed-by: Jonathan Nieder > > Here's a style cleanup on top. > > -- >8 -- > Subject: reset test: modernize style > > Avoid command substitution and pipes to ensure that the exit status > from eac

Re: [PATCH 1/3] Make test "using invalid commit with -C" more strict

Junio C Hamano wrote: >> Kacper Kornet wrote: >>> In the test 'using invalid commit with -C' git-commit would have failed >>> even if the -C option had been given the correct commit, as there was >>> nothing to commit. [...] > Also it would be much simpler to say "git commit --allow-empty". Soun

Re: [PATCH 1/3] Make test "using invalid commit with -C" more strict

Jonathan Nieder writes: > Kacper Kornet wrote: > >> In the test 'using invalid commit with -C' git-commit would have failed >> even if the -C option had been given the correct commit, as there was >> nothing to commit. > > Good catch. > > [...] >> --- a/t/t7501-commit.sh >> +++ b/t/t7501-commit.

Re: [PATCH v2 2/3] t3404: rebase -i: demonstrate short SHA-1 collision

Eric Sunshine wrote: > --- a/t/t3404-rebase-interactive.sh > +++ b/t/t3404-rebase-interactive.sh > @@ -1037,4 +1037,28 @@ test_expect_success 'rebase -i with --strategy and -X' > ' > test $(cat file1) = Z > ' > > +test_expect_success 'short SHA-1 setup' ' > + test_when_finished "git

Re: [PATCH] write_index: optionally allow broken null sha1s

Hi, Jeff King wrote: > --- > I was tempted to not involve filter-branch in this commit at all, and > instead require the user to manually invoke > > GIT_ALLOW_NULL_SHA1=1 git filter-branch ... > > to perform such a filter. That would be slightly safer, but requires > some specialized knowledge

Re: [PATCH 2/2] dir: test_one_path: fix inconsistent behavior due to missing '/'

Eric Sunshine wrote: > Although undocumented, directory_exists_in_index_icase(dirname,len) > unconditionally assumes the presence of a '/' at dirname[len] (despite > being past the end-of-string). Callers are expected to respect [...] >Fix this probl

Re: [PATCH] Documentation/fast-import: clarify summary for `feature` command

Matthieu Moy wrote: > In most cases, "feature " does not just require that the feature > exists, but also changes the behavior to enable it. For what it's worth, Reviewed-by: Jonathan Nieder -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@

Re: [PATCH 1/3] t3404: preserve test_tick state across short SHA-1 collision test

Hi, Eric Sunshine wrote: > The short SHA-1 collision test requires carefully crafted commits in > order to ensure a collision at rebase time. Yeah, this breaks the usual rule that tests should be independent of hashing function. But it's the best we can do, I think. [...] > --- a/t/t3404-rebas

Re: [RFC/PATCH] Fix path prefixing in grep_object

On Sat, Aug 24, 2013 at 10:41:42PM -0700, Jonathan Nieder wrote: > Jeff King wrote: > > > So we are necessarily reconstructing based on what we know of the > > syntax. And I think that your rule is OK, because we know that refnames > > cannot contain a colon. > > What happens with expressions li

Re: [RFC/PATCH] Fix path prefixing in grep_object

Jeff King wrote: > So we are necessarily reconstructing based on what we know of the > syntax. And I think that your rule is OK, because we know that refnames > cannot contain a colon. What happens with expressions like HEAD^{/test:}? Jonathan -- To unsubscribe from this list: send the line "uns

Re: [PATCH 04/13] Use "git merge" instead of "git pull ."

On Sat, Aug 24, 2013 at 9:19 PM, Jonathan Nieder wrote: > Thomas Ackermann wrote: >> --- a/Documentation/user-manual.txt >> +++ b/Documentation/user-manual.txt >> @@ -1784,17 +1784,6 @@ repository that you pulled from. >> <>; instead, your branch will just be >> updated to point to the latest co

Re: [RFC/PATCH] Fix path prefixing in grep_object

Jonathan Nieder writes: > I think Phil meant that when "git grep" is asked to search within > "HEAD:some/path", filenames tacked on at the end should be appended > with a '/' separator instead of the usual ':' (e.g., > "HEAD:some/path/inner/path.c", not "HEAD:some/path:inner/path.c"). Ah, OK. I

Re: [PATCH 11/13] Remove obscure reference from "Examples"

Thomas Ackermann wrote: > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -2131,8 +2131,6 @@ He uses two public branches: > > - A "test" tree into which patches are initially placed so that they > can get some exposure when integrated with other ongoing devel

Re: [PATCH 09/13] Improve section "Merge multiple trees"

Thomas Ackermann wrote: > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -3992,16 +3992,16 @@ Merging multiple trees > > Git helps you do a three-way merge, which you can expand to n-way by > repeating the merge procedure arbitrary times until you finally > -"co

Re: [PATCH] commit: search author pattern against mailmap

Jeff King writes: > On Sat, Aug 24, 2013 at 04:07:47PM +0200, Antoine Pelisse wrote: > >> @@ -945,13 +947,16 @@ static const char *find_author_by_nickname(const char >> *name) >> av[++ac] = buf.buf; >> av[++ac] = NULL; >> setup_revisions(ac, av, &revs, NULL); >> +revs.mailmap

Re: [PATCH 07/13] Improve description in "How to merge"

Thomas Ackermann wrote: > Describe the conflict resolution in terms of the > commands the user is supposed to use. [...] > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -1251,10 +1251,8 @@ Automatic merge failed; fix conflicts and then commit > the result. >

Re: [PATCH 06/13] Simplify "How to make a commit"

Thomas Ackermann wrote: > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -1080,19 +1080,14 @@ produce no output at that point. > > Modifying the index is easy: > > -To update the index with the new contents of a modified file, use > +To add the contents of a ne

Re: [PATCH 05/13] Fix some typos

Thomas Ackermann wrote: > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -219,7 +219,7 @@ of development leading to that point. > > The best way to see how this works is using the linkgit:gitk[1] > command; running gitk now on a Git repository and looking for me

Re: [RFC/PATCH] Fix path prefixing in grep_object

On Sat, Aug 24, 2013 at 09:35:58PM -0400, Phil Hord wrote: > When the pathspec given to grep includes a tree name, the full > name of matched files is assembled using colon as a separator. > If the pathspec includes a tree name, it should use a slash > instead. > > Check if the pathspec already n

Re: [PATCH v3 00/24] Index-v5

On Sun, Aug 25, 2013 at 10:07 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> On Mon, Aug 19, 2013 at 2:41 AM, Thomas Gummerer >> wrote: >> >> I'm done reviewing this version (I neglected the extension writing >> patches because after spending hours on the main write patch I don't >> want t

Re: [RFC/PATCH] Fix path prefixing in grep_object

Junio C Hamano wrote: > Phil Hord writes: >> On Sat, Aug 24, 2013 at 9:35 PM, Phil Hord wrote: >>> When the pathspec given to grep includes a tree name, the full >>> name of matched files is assembled using colon as a separator. >>> If the pathspec includes a tree name, it should use a slash >>>

Re: [PATCH 04/13] Use "git merge" instead of "git pull ."

Thomas Ackermann wrote: > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -1784,17 +1784,6 @@ repository that you pulled from. > <>; instead, your branch will just be > updated to point to the latest commit from the upstream branch.) > > -The `git pull` command ca

Re: [PATCH 03/13] Use current output for "git repack"

Thomas Ackermann wrote: > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -3203,14 +3203,11 @@ To put the loose objects into a pack, just run git > repack: > > > $ git repack [...] > -Total 6020, written 6020 (del

Re: [PATCH] commit: search author pattern against mailmap

On Sat, Aug 24, 2013 at 04:07:47PM +0200, Antoine Pelisse wrote: > @@ -945,13 +947,16 @@ static const char *find_author_by_nickname(const char > *name) > av[++ac] = buf.buf; > av[++ac] = NULL; > setup_revisions(ac, av, &revs, NULL); > + revs.mailmap = &mailmap; > + read_

Re: [PATCH 13/13] "git prune" is safe now

Thomas Ackermann writes: > According to the man-pages of "git prune" and "git fsck", > both are safe nowadays. Safe does not have much to do with the latter. "git fsck" has always been safe in that it would not alter the object store, and if you run it while you are actively creating (or prunin

Re: [PATCH 12/13] Remove irrelevant reference from "Tying it all together"

Thomas Ackermann writes: > Sorry Jon, but this might not be of any help to new Git users ;) > > Signed-off-by: Thomas Ackermann Yeah, I think this is long overdue. The drawing was taken from an e-mail posted in a discussion, and the credit should have been given in the commit log message, not

Re: [PATCH 11/13] Remove obscure reference from "Examples"

Thomas Ackermann writes: > Signed-off-by: Thomas Ackermann > --- > Documentation/user-manual.txt | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt > index aa6bfab..0d3f04e 100644 > --- a/Documentation/user-manual.txt > +++ b/

Re: [RFC/PATCH] git-remote-mediawiki: reset private ref after non-dumb push

Matthieu Moy writes: > How would I do that? The update to the remote namespace is done by Git, > not by the remote-helper. > > OK, I'm now convinced that my solution is the right one. The > alternatives are far more complex and I still fail to see the benefits. Sounds like a plan, even though it

Re: [PATCH 02/13] Use current "detached HEAD" message

Thomas Ackermann wrote: > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -312,10 +312,17 @@ referenced by a tag: > > > $ git checkout v2.6.17 > - Note: moving to "v2.6.17" which isn't a local branch

Re: [RFC/PATCH] Fix path prefixing in grep_object

Phil Hord writes: > On Sat, Aug 24, 2013 at 9:35 PM, Phil Hord wrote: >> >> When the pathspec given to grep includes a tree name, the full >> name of matched files is assembled using colon as a separator. >> If the pathspec includes a tree name, it should use a slash >> instead. >> >> Check if t

Re: [PATCH 10/13] Remove unnecessary historical note from "Object storage format"

Thomas Ackermann writes: > Signed-off-by: Thomas Ackermann > --- > Documentation/user-manual.txt | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt > index f713f26..aa6bfab 100644 > --- a/Documentation/user-manual.txt > +++ b/

Re: [PATCH 08/13] Improve section "Manipulating branches"

Thomas Ackermann writes: > Add some missing punctuation. > Simplify description of "git branch -d/-D". > ... > `git branch -d `:: > - delete the branch ``; if the branch you are deleting > - points to a commit which is not reachable from the current > - branch, this command will fail

Re: [PATCH 07/13] Improve description in "How to merge"

Thomas Ackermann writes: > Describe the conflict resolution in terms of the > commands the user is supposed to use. > > Signed-off-by: Thomas Ackermann > --- > Documentation/user-manual.txt | 6 ++ > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/Documentation/user-manual.

Re: [PATCH 06/13] Simplify "How to make a commit"

Thomas Ackermann writes: > Combine the two cases for "git add" into one. > Add verb "use" to "git rm" case. > > Signed-off-by: Thomas Ackermann > --- > Documentation/user-manual.txt | 11 +++ > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/Documentation/user-manual.tx

Re: [PATCH 04/13] Use "git merge" instead of "git pull ."

Thomas Ackermann writes: > "git pull ." works, but "git merge" is the recommended > way for new users to do things. (The old description > also should have read "The former is actually *not* very > commonly used".) I think it is probably a good idea to replace "pull ." in the two later hunks wi

Re: [PATCH 01/13] Call it "Git User Manual" and remove reference to very old Git version

Thomas Ackermann writes: > Signed-off-by: Thomas Ackermann > --- > Documentation/user-manual.txt | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt > index fe723e4..103ec9a 100644 > --- a/Documentation/user

Re: [PATCH v3 00/24] Index-v5

Duy Nguyen writes: > On Mon, Aug 19, 2013 at 2:41 AM, Thomas Gummerer wrote: > > I'm done reviewing this version (I neglected the extension writing > patches because after spending hours on the main write patch I don't > want to look at them anymore :p). Now that rc period is over, with a > part

Re: [PATCH 01/13] Call it "Git User Manual" and remove reference to very old Git version

Thomas Ackermann wrote: > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -1,6 +1,5 @@ > -Git User's Manual (for version 1.5.3 or newer) > +Git User Manual "User" versus "User's": why? But I don't care much about this. Dropping the reference to 1.5.3 is very welco

Re: [PATCH v2] git-p4: Ask "p4" to interpret View setting

p...@padd.com wrote on Thu, 15 Aug 2013 21:24 -0400: > ksaitoh...@gmail.com wrote on Wed, 14 Aug 2013 09:59 +0900: > > > My only concern is in the commit message, about performance. A > > > change that has lots of files in it will cause many roundtrips to > > > p4d to do "p4 where" on each. When

Re: [RFC/PATCH] Fix path prefixing in grep_object

On Sat, Aug 24, 2013 at 9:35 PM, Phil Hord wrote: > > When the pathspec given to grep includes a tree name, the full > name of matched files is assembled using colon as a separator. > If the pathspec includes a tree name, it should use a slash > instead. > > Check if the pathspec already names a t

[RFC/PATCH] Fix path prefixing in grep_object

When the pathspec given to grep includes a tree name, the full name of matched files is assembled using colon as a separator. If the pathspec includes a tree name, it should use a slash instead. Check if the pathspec already names a tree and ref (including a colon) and use a slash if so. --- I'm

Re: [PATCH 3/3] t/t7106-reset-unborn-branch.sh: Add PERL prerequisite

Kacper Kornet wrote: > Signed-off-by: Kacper Kornet Thanks. Reviewed-by: Jonathan Nieder Here's a style cleanup on top. -- >8 -- Subject: reset test: modernize style Avoid command substitution and pipes to ensure that the exit status from each git command is tested (and in particular that a

Re: [PATCH 2/3] t/t3701-add-interactive.sh: Add PERL prerequisite

Kacper Kornet wrote: > --- a/t/t3701-add-interactive.sh > +++ b/t/t3701-add-interactive.sh > @@ -330,7 +330,7 @@ test_expect_success PERL 'split hunk "add -p (edit)"' ' > ! grep "^+15" actual > ' > > -test_expect_success 'patch mode ignores unmerged entries' ' > +test_expect_success PERL

Re: [PATCH 1/3] Make test "using invalid commit with -C" more strict

Kacper Kornet wrote: > In the test 'using invalid commit with -C' git-commit would have failed > even if the -C option had been given the correct commit, as there was > nothing to commit. Good catch. [...] > --- a/t/t7501-commit.sh > +++ b/t/t7501-commit.sh > @@ -53,7 +53,10 @@ test_expect_succ

Re: [PATCH 0/3] Fixes for tests run without perl

Hi, Kacper Kornet wrote: > This is a set of fixes for problems found while running > test suite without perl installed. I don't think git ever supported that. The PERL prerequisite was to check for systems that did not have (a suitable) perl at runtime, but perl is still pretty heavily used in

Re: [PATCH 0/13] Modernize user-manual

From: "Thomas Ackermann" Hi, command output has changed for some commands in the last years, so reflect this also in the user-manual. While doing so, fix some minor spelling, formatting and wording issues. Further, some references and recommendations which nowadays might only confuse and not h

[ANNOUNCE] tig-1.2.1

Hello, Due to a bug in the handling of submodules, here is a new release of Tig. In addition to the bug fix, this new version reduces memory usage and startup time of the main view and shows the blob size in the tree view. Note to packagers: the manual and manpage documentation files now live ins

contrib/credential/netrc/git-credential-netrc: Use of uninitialized value in string

Hello, I've tried to use the netrc credential with git-send-email (v1.8.4-rc2), and I've had the following log (running with -d -v): We were given search token protocol and value smtp We were given search token host and value smtp.gmail.com:587 We were given search token username and value apeli..

[PATCH] commit: search author pattern against mailmap

"git commit --author=$name" sets the author to one whose name matches the given string from existing commits, when $name is not in the "Name " format. However, it does not honor the mailmap to use the canonical name for the author found this way. Fix it by telling the logic to find a matching exis

Re: [PATCH v3 18/24] read-cache: write index-v5

On Sat, Aug 24, 2013 at 11:07 AM, Duy Nguyen wrote: > On Mon, Aug 19, 2013 at 2:42 AM, Thomas Gummerer wrote: >> Write the index version 5 file format to disk. This version doesn't >> write the cache-tree data and resolve-undo data to the file. > > I keep having things to add after sending my ema

Re: How to set tab size for hunks in “git add -p”?

Thanks a lot! That solution worked for me: env TERM=linux setterm -regtabs 4 Best regards, Alexander Yancharuk a...@itvault.info On 23.08.2013 22:19, Antoine Pelisse wrote: On Fri, Aug 23, 2013 at 7:28 PM, Янчарук Александр wrote: But those settings seems does not a

Re: [RFC/PATCH] git-remote-mediawiki: reset private ref after non-dumb push

Felipe Contreras writes: > On Fri, Aug 23, 2013 at 3:25 AM, Matthieu Moy > wrote: > >> This is assuming you follow the scheme >> >> git -> local repo for other vcs -> remote repo for other vcs >> >> which itself more or less assumes that the other VCS is a decentralized >> VCS. I understand th

[PATCH 13/13] "git prune" is safe now

According to the man-pages of "git prune" and "git fsck", both are safe nowadays. Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 12 +--- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt inde

[PATCH 12/13] Remove irrelevant reference from "Tying it all together"

Sorry Jon, but this might not be of any help to new Git users ;) Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 0d3f04e..08d8c91 100644 --

[PATCH 11/13] Remove obscure reference from "Examples"

Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index aa6bfab..0d3f04e 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2131,8 +2

[PATCH 10/13] Remove unnecessary historical note from "Object storage format"

Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index f713f26..aa6bfab 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -4132,8 +4

[PATCH 09/13] Improve section "Merge multiple trees"

Remove unnecessary quoting. Simplify description of three-way merge. Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index d5baf03..

[PATCH 08/13] Improve section "Manipulating branches"

Add some missing punctuation. Simplify description of "git branch -d/-D". Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 19 +++ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt inde

[PATCH 07/13] Improve description in "How to merge"

Describe the conflict resolution in terms of the commands the user is supposed to use. Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index

[PATCH 06/13] Simplify "How to make a commit"

Combine the two cases for "git add" into one. Add verb "use" to "git rm" case. Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 8a

[PATCH 05/13] Fix some typos

Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index ca78333..ccbddc7 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/use

[PATCH 04/13] Use "git merge" instead of "git pull ."

"git pull ." works, but "git merge" is the recommended way for new users to do things. (The old description also should have read "The former is actually *not* very commonly used".) Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 15 ++- 1 file changed, 2 insert

[PATCH 03/13] Use current output for "git repack"

Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index cb30929..b450980 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/

[PATCH 02/13] Use current "detached HEAD" message

Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 17 - 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 103ec9a..cb30929 100644 --- a/Documentation/user-manual.txt +++ b/Documenta

[PATCH 01/13] Call it "Git User Manual" and remove reference to very old Git version

Signed-off-by: Thomas Ackermann --- Documentation/user-manual.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index fe723e4..103ec9a 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manu

[PATCH 0/13] Modernize user-manual

Hi, command output has changed for some commands in the last years, so reflect this also in the user-manual. While doing so, fix some minor spelling, formatting and wording issues. Further, some references and recommendations which nowadays might only confuse and not help new Git users where re