Re: [PATCH] Add Code Compare v2.80.4 as a merge / diff tool for Windows

On Wed, Aug 8, 2012 at 11:26 PM, Junio C Hamano wrote: > I do not have a strong reason to vote for or against inclusion of > yet another tool as mergetool backends (read: Meh), but what this That sounds almost as if you'd like to keep the number of directly supported mergetools small (I'm not ta

Please pull git-l10n updates for git v1.7.12-rc2

Hi Junio, The following changes since commit bfbf4d477a33be413800f531c3ac0d227f46ab44: Merge git://github.com/git-l10n/git-po (2012-08-05 20:51:05 -0700) are available in the git repository at: git://github.com/git-l10n/git-po master for you to fetch changes up to cc2f50dafe28fda6652e1ab7

Re: [PATCH 4/4] command-list: mention git-credential-* helpers

Jeff King writes: > These commands were never added to the command-list. Adding > them makes "make check-docs" run without complaint. > While we're at it, let's capitalize the first letter of > their one-line summaries to match the rest of the git > manpages. You may want to squash my patch in t

Re: fast-import error: fatal: 'refs/heads/master' - not a valid ref

git --version git version 1.7.11.3 On Wed, Aug 8, 2012 at 9:54 PM, Jeff King wrote: > On Wed, Aug 08, 2012 at 11:25:02AM +0400, Andrey Pavlenko wrote: > >> I'm developing a remote helper which uses the fast-import stream for >> fetching. When I perform cloning git prints error message - "fatal: >

Re: fast-import error: fatal: 'refs/heads/master' - not a valid ref

My helper really executes git show-ref before writting the export stream... Thank you for pointing that out and sorry for disturbing. On Thu, Aug 9, 2012 at 12:22 PM, Andrey Pavlenko wrote: > git --version > git version 1.7.11.3 > > On Wed, Aug 8, 2012 at 9:54 PM, Jeff King wrote: >> On Wed, Aug

Re: [PATCH/RFC v2 06/16] t3700: sleep for 1 second, to avoid interfering with the racy code

On 08/08, Junio C Hamano wrote: > Junio C Hamano writes: > > > So whether done with "sleep" or "test-chmtime", avoiding a racily > > clean situation sounds like sweeping a bug in the v5 code in racy > > situation under the rug to me (unless I am misunderstanding what > > you are doing with this c

Re: [PATCH] gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO

Jay Soffian writes: > When gitweb is used as a DirectoryIndex, it attempts to strip > PATH_INFO on its own, as $cgi->url() fails to do so. > > However, it fails to account for the fact that PATH_INFO has > already been URL-decoded by the web server, but the value > returned by $cgi->url() has not

[PATCH v2] add tests for 'git rebase --keep-empty'

Add test cases for 'git rebase --keep-empty' with and without an "empty" commit already in upstream. The empty commit that is about to be rebased should be kept in both cases. Signed-off-by: Martin von Zweigbergk --- Added another test for when the upstream already has an empty commit. The test

Re: [PATCH v2 resend] gitk: Use an external icon file on Windows

Sebastian Schuberth writes: > On Wed, Aug 8, 2012 at 11:13 PM, Junio C Hamano wrote: > >> Forwarding a misdirected patch to the maintainer who is free to pick >> or ignore. > > How am I supposed to know if a patch has been ignored as an oversight > (in which case I would resend), or because the

Re: [PATCH] Add Code Compare v2.80.4 as a merge / diff tool for Windows

Sebastian Schuberth writes: > On Wed, Aug 8, 2012 at 11:26 PM, Junio C Hamano wrote: > >> I do not have a strong reason to vote for or against inclusion of >> yet another tool as mergetool backends (read: Meh), but what this > > That sounds almost as if you'd like to keep the number of directly

[RFC/PATCH] rebase -i: use full onto sha1 in reflog

'git rebase' uses the full onto sha1 for the reflog message whereas 'git rebase -i' uses the short sha1. This is not only inconsistent, but can lead to problems when the reflog is inspected at a later time at which that abbreviation may have become ambiguous. Make 'rebase -i' use the full onto sha

Re: [PATCH v2 resend] gitk: Use an external icon file on Windows

On Thu, Aug 9, 2012 at 5:54 PM, Junio C Hamano wrote: >>> Forwarding a misdirected patch to the maintainer who is free to pick >>> or ignore. >> >> How am I supposed to know if a patch has been ignored as an oversight >> (in which case I would resend), or because the maintainer decided not >> to

Re: [PATCH] Add Code Compare v2.80.4 as a merge / diff tool for Windows

On Thu, Aug 9, 2012 at 6:03 PM, Junio C Hamano wrote: >> I still agree that not listing all mergetools in multiple places is a >> good thing. But doing the whole stuff of extending --tool-help for >> git-mergetool and git-difftool to return a simple list that can be >> used in git-completion.bash

Re: The GitTogether

Michael J Gruber venit, vidit, dixit 30.07.2012 15:17: > Jens Lehmann venit, vidit, dixit 29.07.2012 17:55: >> Am 27.07.2012 13:45, schrieb Thomas Rast: >>> Scott Chacon writes: >>> GitHub would like to volunteer to organize and pay for these events this year. I would like to hold the d

Re: [PATCH/RFC v2 06/16] t3700: sleep for 1 second, to avoid interfering with the racy code

Thomas Gummerer writes: > On 08/08, Junio C Hamano wrote: >> ... >> Let me ask the same question in a more direct way. Which part of >> this test break with your series? >> >> test_expect_success 'git add --refresh with pathspec' ' >> git reset --hard && >>

Re: [RFC/PATCH] rebase -i: use full onto sha1 in reflog

On Thu, Aug 9, 2012 at 9:05 AM, Michael J Gruber wrote: > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index 0d2056f..dbc9de6 100644 > --- a/git-rebase--interactive.sh > +++ b/git-rebase--interactive.sh > @@ -573,7 +573,7 @@ do_next () { > newhead=$(git rev-parse

Re: [RFC/PATCH] rebase -i: use full onto sha1 in reflog

Michael J Gruber writes: > 'git rebase' uses the full onto sha1 for the reflog message whereas 'git > rebase -i' uses the short sha1. This is not only inconsistent, but can > lead to problems when the reflog is inspected at a later time at which > that abbreviation may have become ambiguous. > >

Re: [PATCH v2] add tests for 'git rebase --keep-empty'

Martin von Zweigbergk writes: > Add test cases for 'git rebase --keep-empty' with and without an > "empty" commit already in upstream. The empty commit that is about to > be rebased should be kept in both cases. > > Signed-off-by: Martin von Zweigbergk > --- > > Added another test for when the u

Re: [PATCH v2] git svn: reset invalidates the memoized mergeinfo caches

Signed-off-by: Steven Walter On Thu, Aug 9, 2012 at 2:42 AM, Peter Baumann wrote: > On Wed, Aug 08, 2012 at 10:52:58PM +, Eric Wong wrote: >> Peter Baumann wrote: >> > On Tue, Aug 07, 2012 at 08:45:10PM +, Eric Wong wrote: >> > > Peter Baumann wrote: >> > > > + fo

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

Eric Wong writes: > Robert Luberda wrote: >> Eric Wong wrote: >> >> + echo "PATH=\"$PATH\"; export PATH" >> $hook >> >> + echo "svnconf=\"$svnconf\"" >> $hook >> >> + cat >> "$hook" <<- 'EOF2' >> >> + cd work-auto-commits.svn >> >> + svn up

Re: [RFC/PATCH] rebase -i: use full onto sha1 in reflog

Martin von Zweigbergk writes: > On Thu, Aug 9, 2012 at 9:05 AM, Michael J Gruber > wrote: >> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh >> index 0d2056f..dbc9de6 100644 >> --- a/git-rebase--interactive.sh >> +++ b/git-rebase--interactive.sh >> @@ -573,7 +573,7 @@ do_nex

Re: Please pull git-l10n updates for git v1.7.12-rc2

Jiang Xin writes: > Hi Junio, > > The following changes since commit bfbf4d477a33be413800f531c3ac0d227f46ab44: > > Merge git://github.com/git-l10n/git-po (2012-08-05 20:51:05 -0700) > > are available in the git repository at: > > > git://github.com/git-l10n/git-po master > > for you to fetch

Re: git with uucp for deployment

> Thomas Hochstein : > Randal L. Schwartz schrieb: >> I am unaware of *anyone* using uucp these days, > UUCP over TCP/IP is still in use for transmission of mail and Usenet > news. No, it isn't. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to ma

[PATCH] gitweb: Add support for gravatar-ssl

Teach gitweb to allow 'avatar' to be set to 'gravatar-ssl', switching to the https://secure.gravatar.com url form, to avoid mixed content warnings when serving gitweb over https, with gravatar enabled. --- I'd alternatively propose always using the https:// form of the URL, but it seems significan

Re: [PATCH] gitweb: Add support for gravatar-ssl

Chris West (Faux) wrote: > Teach gitweb to allow 'avatar' to be set to 'gravatar-ssl', switching > to the https://secure.gravatar.com url form, to avoid mixed content > warnings when serving gitweb over https, with gravatar enabled. > --- > I'd alternatively propose always using the https:// form

Re: [PATCH] gitweb: Add support for gravatar-ssl

On Thu, Aug 09, 2012 at 09:36:46PM +0200, Giuseppe Bilotta wrote: > Chris West (Faux) wrote: > > > Teach gitweb to allow 'avatar' to be set to 'gravatar-ssl', switching > > to the https://secure.gravatar.com url form, to avoid mixed content > > warnings when serving gitweb over https, with gravata

[PATCH] Let submodule command exit with error status if path does not exist

Previously the exit status of git submodule was zero for various subcommands even though the user specified an unknown path. The reason behind that was that they all pipe the output of module_list into the while loop which then does the action on the paths specified by the commandline. Since piped

Re: [PATCH] Let submodule command exit with error status if path does not exist

Heiko Voigt writes: > Previously the exit status of git submodule was zero for various > subcommands even though the user specified an unknown path. > > The reason behind that was that they all pipe the output of module_list > into the while loop which then does the action on the paths specified

[PATCH] git bash completion handles alias options

git bash completion now handles git alias options. It means that options which change the completion behavior for complete commands will also change the behavior of completion for aliased command. bash completion now handle git alias options. I did a use case in another commit: a checkout alias

[PATCH] git bash completion handles alias options

git bash completion now handles git alias options. It means that options which change the completion behavior for complete commands will also change the behavior of completion for aliased command. bash completion now handle git alias options. I did a use case in another commit: a checkout alias wh

Re: [PATCH/RFC v3 01/13] Move index v2 specific functions to their own file

Thomas Gummerer writes: > /* remember to discard_cache() before reading a different cache! */ > int read_index_from(struct index_state *istate, const char *path) > { > ... > mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, > 0); > - close(fd); > if (mmap

Re: [PATCH/RFC v3 04/13] Add documentation of the index-v5 file format

Thomas Gummerer writes: > +GIT index format > + > + > +== The git index file format > + > + The git index file (.git/index) documents the status of the files > + in the git staging area. > + > + The staging area is used for preparing commits, merging, etc. The above two a

Re: [PATCH/RFC v2 06/16] t3700: sleep for 1 second, to avoid interfering with the racy code

On 08/09, Junio C Hamano wrote: > Thomas Gummerer writes: > > > On 08/08, Junio C Hamano wrote: > >> ... > >> Let me ask the same question in a more direct way. Which part of > >> this test break with your series? > >> > >> test_expect_success 'git add --refresh with pathspec' ' > >>

Re: [PATCH/RFC v3 07/13] Read resolve-undo data

Thomas Gummerer writes: > Make git read the resolve-undo data from the index. > > Since the resolve-undo data is joined with the conflicts in > the ondisk format of the index file version 5, conflicts and > resolved data is read at the same time, and the resolve-undo > data is then converted to t

Re: [PATCH/RFC v3 01/13] Move index v2 specific functions to their own file

On 08/09, Junio C Hamano wrote: > Thomas Gummerer writes: > > > /* remember to discard_cache() before reading a different cache! */ > > int read_index_from(struct index_state *istate, const char *path) > > { > > ... > > mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd,

Re: [PATCH/RFC v3 04/13] Add documentation of the index-v5 file format

On 08/09, Junio C Hamano wrote: > Thomas Gummerer writes: > > > +GIT index format > > + > > + > > +== The git index file format > > + > > + The git index file (.git/index) documents the status of the files > > + in the git staging area. > > + > > + The staging area is used

Re: [PATCH/RFC v3 04/13] Add documentation of the index-v5 file format

Junio C Hamano writes: >> +== Design explanations >> + ... >> +[3] The data of the cache-tree extension and the resolve undo >> +extension is now part of the index itself, but if other extensions >> +come up in the future, there is no need to change the index, they >> +can simply be a

Re: [PATCH/RFC v3 07/13] Read resolve-undo data

On 08/09, Junio C Hamano wrote: > Thomas Gummerer writes: > > > Make git read the resolve-undo data from the index. > > > > Since the resolve-undo data is joined with the conflicts in > > the ondisk format of the index file version 5, conflicts and > > resolved data is read at the same time, and

Re: [PATCH/RFC v3 07/13] Read resolve-undo data

Thomas Gummerer writes: > On 08/09, Junio C Hamano wrote: >> Thomas Gummerer writes: >> >> > Make git read the resolve-undo data from the index. >> > >> > Since the resolve-undo data is joined with the conflicts in >> > the ondisk format of the index file version 5, conflicts and >> > resolved

Re: [PATCH/RFC v3 01/13] Move index v2 specific functions to their own file

Junio C Hamano writes: > If you found that an entry you read halfway has an inconsistent crc, > and if you suspect that is because somebody else was writing to the > same index, it is a _sure_ sign that you are not alone, and all the > entries you read so far to the core, even if they weren't tou

git am and the wrong chunk of ---

Hello, I have some contributors who consistently put their commentary *before* the "---" line rather than *after* it, presumably with the notion that it is some kind of "cover text". This messes with "git am", and so I end up having to edit those posts manually. I have tried git am --scisso

[BUG?] fetching via file:// vs ssh://

Hi, At $dayjob we have backups setup for developers using a post-commit hook that rsyncs the local .git directory to a backup server. The advantage we get of using rsync instead of git push is that we also backup the things that git push doesn't touch (e.g. config, hooks, metadata from other tools

Fwd: [BUG?] fetching via file:// vs ssh://

(Junio, sorry for the spam. Using the gmail web interface which hides the reply all option) On Fri, Aug 10, 2012 at 12:55 PM, Junio C Hamano wrote: > File:///n/a/b/c and /n/a/b/c behave differently, and the former is more like > ssh://host/n/a/b/c. So it does. $ git remote add -f rmt3 file://

[PATCH/RFC] [git-subtree.sh] Use raw subject and body modifier "%B" instead of "%s%n%n%b" for commit

I don't know if it is the right place to post this patch, I have sended an email to the original author apenwarr and have no response. According to , this is the place, but

[PATCH] subtree.sh: Use raw subject and body modifier "%B" instead of "%s%n%n%b"

"%s%n%n%b" is not always equal to "%B". If the commit msg does not have a body, this will append an extra new-line character to the msg title which would cause the splited commit has a new sha1 hash. In most cases, this does not matter, but for a project which did not merged using this script initi

Re: git am and the wrong chunk of ---

"H. Peter Anvin" writes: > Hello, > > I have some contributors who consistently put their commentary > *before* the "---" line rather than *after* it, presumably with the > notion that it is some kind of "cover text". This messes with "git > am", and so I end up having to edit those posts manual

Re: [PATCH/RFC v3 01/13] Move index v2 specific functions to their own file

On Fri, Aug 10, 2012 at 7:13 AM, Junio C Hamano wrote: > By the way, you can only detect such inconsistency when you are > lucky enough that you catch the other person in the middle of > writing. > > If the index you are looking at holds a large tree with very many > paths, it is possible that the

Re: [PATCH] Add Code Compare v2.80.4 as a merge / diff tool for Windows

On Thu, Aug 9, 2012 at 9:22 AM, Sebastian Schuberth wrote: > On Thu, Aug 9, 2012 at 6:03 PM, Junio C Hamano wrote: > >>> I still agree that not listing all mergetools in multiple places is a >>> good thing. But doing the whole stuff of extending --tool-help for >>> git-mergetool and git-difftool

[PATCH] mergetool,difftool: Document --tool-help consistently

Add an entry for --tool-help to the mergetool documentation. Move --tool-help in the difftool documentation so that it is listed immediately after --tool so that it is easier to find. Signed-off-by: David Aguilar --- Based on work in next. This is not urgent as the current difftool topics are c

[PATCHv2] rebase -i: use full onto sha1 in reflog

'git rebase' uses the full onto sha1 for the reflog message whereas 'git rebase -i' uses the short sha1. This is not only inconsistent, but can lead to problems when the reflog is inspected at a later time at which that abbreviation may have become ambiguous. Make 'rebase -i' use the full onto sha