[PATCH] gitk: Synchronize highlighting in file view when scrolling diff

2012-09-18 Thread Stefan Haller
Whenever the diff pane scrolls, highlight the corresponding file in the file list on the right. For a large commit with many files and long per-file diffs, this makes it easier to keep track of what you're looking at. This allows simplifying the prevfile and nextfile functions, because all they

Re: Test failure: Test #3 in t1304-default-acl

2012-09-18 Thread Ramkumar Ramachandra
Hi, Matthieu Moy wrote: I can see two reasons for having the same UID for two login names: 1) the sysadmin really messed up, and as you say, a total stranger has complete ownership of your files. Ramkumar, you should check that this is not your case. Looks like my sysadmin really screwed up

RE: [PATCH v7 1/4] make poll available for other platforms lacking it

2012-09-18 Thread Joachim Schmitz
From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Tuesday, September 18, 2012 12:42 AM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: [PATCH v7 1/4] make poll available for other platforms lacking it Joachim Schmitz j...@schmitz-digital.de writes: move poll.[ch] out of

[RFC PATCH] add t3420-rebase-topology

2012-09-18 Thread Martin von Zweigbergk
Add more test cases to check that the topology after a rebase is as expected. Conflicts are not considered, but patch-equivalence is. --- Tests pass and fail as indicated by the suffix (_success/_failure). Your input especially appreciated on whether you agree with the intent of the test cases.

Re: [PATCH] t/perf: add trash directory to .gitignore

2012-09-18 Thread Ramkumar Ramachandra
Hi, Junio C Hamano wrote: Thanks. I _think_ you still want to make sure these are directories, so instead of losing the trailing slash, you would want to keep it and add a leading slash to anchor them to the t/perf directory, i.e. /build/ /test-results/ /trash

RE: [PATCH/RFC] Port to HP NonStop

2012-09-18 Thread Joachim Schmitz
Signed-off-by: Joachim Schmitz j...@schmitz-digital.de --- This needs the 4 compat-poll patches posted earlier. Needs a different link order in Makefile: libintl before libiconv. This may affect other platforms, so needs some checking. Also I'm not really sure how to best #ifdef the #include

Re: [PATCH] t/test-lib: print pretty msg when git isn't built

2012-09-18 Thread Ramkumar Ramachandra
Hi Junio, Junio C Hamano wrote: Is this a sufficient replacement for what you removed from ? Can the BUILD-OPTIONS file exist when your build of git failed? Oops, I didn't realize that BUILD-OPTIONS would be written when the build fails. How about something like this instead: diff --git

Re: [PATCH v7 1/4] make poll available for other platforms lacking it

2012-09-18 Thread Junio C Hamano
Joachim Schmitz j...@schmitz-digital.de writes: @@ -1605,6 +1610,11 @@ ifdef NO_GETTEXT BASIC_CFLAGS += -DNO_GETTEXT USE_GETTEXT_SCHEME ?= fallthrough endif +ifdef NO_POLL + NO_SYS_POLL_H = YesPlease + COMPAT_CFLAGS += -DNO_POLL -Icompat/poll + COMPAT_OBJS +=

Re: [PATCH 2/3] rebase -i: Teach --edit-todo action

2012-09-18 Thread Junio C Hamano
Andrew Wong andrew.k...@gmail.com writes: On 09/16/12 02:54, Junio C Hamano wrote: In any case, what information are you discarding and then replacing with the standard boilerplate? It's to strip out the comment that says: # However, if you remove everything, the rebase will be aborted.

Re: [PATCH] t/test-lib: print pretty msg when git isn't built

2012-09-18 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Hi Junio, Junio C Hamano wrote: Is this a sufficient replacement for what you removed from ? Can the BUILD-OPTIONS file exist when your build of git failed? Oops, I didn't realize that BUILD-OPTIONS would be written when the build fails.

RE: [PATCH v7 1/4] make poll available for other platforms lacking it

2012-09-18 Thread Joachim Schmitz
From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Tuesday, September 18, 2012 8:55 AM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: [PATCH v7 1/4] make poll available for other platforms lacking it Joachim Schmitz j...@schmitz-digital.de writes: @@ -1605,6 +1610,11 @@

Re: [PATCH] t/test-lib: print pretty msg when git isn't built

2012-09-18 Thread Ramkumar Ramachandra
Hi, Junio C Hamano wrote: Ramkumar Ramachandra artag...@gmail.com writes: Hi Junio, Junio C Hamano wrote: Is this a sufficient replacement for what you removed from ? Can the BUILD-OPTIONS file exist when your build of git failed? Oops, I didn't realize that BUILD-OPTIONS would be

Re: [RFC PATCH] add t3420-rebase-topology

2012-09-18 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: do you agree that 'rebase --onto does not re-apply patches in onto' is desirable? This depends on how you look at --onto. Recall the most typical and the original use case of rebase: A'--C' your rebased work

Re: [RFC PATCH] add t3420-rebase-topology

2012-09-18 Thread Johannes Sixt
Am 9/18/2012 8:31, schrieb Martin von Zweigbergk: Add more test cases to check that the topology after a rebase is as expected. Conflicts are not considered, but patch-equivalence is. --- Tests pass and fail as indicated by the suffix (_success/_failure). Your input especially appreciated

Re: [PATCH] t/test-lib: print pretty msg when git isn't built

2012-09-18 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Hi, Junio C Hamano wrote: Ramkumar Ramachandra artag...@gmail.com writes: Hi Junio, Junio C Hamano wrote: Is this a sufficient replacement for what you removed from ? Can the BUILD-OPTIONS file exist when your build of git failed?

Re: [PATCH] t/test-lib: print pretty msg when git isn't built

2012-09-18 Thread Ramkumar Ramachandra
Hi Junio, Junio C Hamano wrote: Junio C Hamano wrote: Yeah, but why change it so much? Wouldn't writing $GIT_BUILD_DIR/git /dev/null if test $? != 1 then : You haven't built git! fi just like the original in be sufficient?? Because

RE: [PATCH/RFC] Port to HP NonStop

2012-09-18 Thread Joachim Schmitz
From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Tuesday, September 18, 2012 9:57 AM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: [PATCH/RFC] Port to HP NonStop Joachim Schmitz j...@schmitz-digital.de writes: Needs a different link order in Makefile: libintl before

Re: [PATCH] string_list API: document what sorted means.

2012-09-18 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: 1. Document that string_list sorts entries according to their strcmp() order, as proposed in this patch. Then fetch can rely on this ordering. If somebody wants a different ordering in the future, it is easy to make the sort order a parameter.

Re: Using Format/export-subst Howto.

2012-09-18 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 17.09.2012 22:21: Michael J Gruber g...@drmicha.warpmail.net writes: Junio C Hamano venit, vidit, dixit 15.09.2012 00:26: Junio C Hamano gits...@pobox.com writes: Michael J Gruber g...@drmicha.warpmail.net writes: you need to rm file git checkout file).

RE: Unable to clone GIT project

2012-09-18 Thread Ankush_Aggarwal
All, Thanks for reply but its not working still. Things which I have done till now is On Linux machine Installed libiconv-1.14 unded /usr/local/lib path. -rw-r--r-- 1 root root 912 Sep 15 20:40 libiconv.la lrwxrwxrwx 1 root root 17 Sep 15 20:40

Re: [PATCH] string_list API: document what sorted means.

2012-09-18 Thread Michael Haggerty
On 09/18/2012 10:19 AM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: 1. Document that string_list sorts entries according to their strcmp() order, as proposed in this patch. Then fetch can rely on this ordering. If somebody wants a different ordering in the future,

Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-18 Thread Bert Wesarg
On Tue, Sep 18, 2012 at 4:52 AM, Mischa POSLAWSKY g...@shiar.nl wrote: Junio C Hamano skribis 2012-9-16 22:22 (-0700): Mischa POSLAWSKY g...@shiar.nl writes: Subject: [PATCH/RFC] format-patch: force default file prefixes in diff Override user configuration (eg. diff.noprefix) in patches

Re: Unable to clone GIT project

2012-09-18 Thread Andreas Schwab
ankush_aggar...@dell.com writes: On Linux machine Installed libiconv-1.14 unded /usr/local/lib path. Why do you need that library? iconv is part of glibc. Moreover, git wouldn't link against libiconv anyway unless you explicitly ask for it. Andreas. -- Andreas Schwab,

[PATCH] rebase -i: fix misleading error message after 'exec no-such' instruction

2012-09-18 Thread Johannes Sixt
From: Johannes Sixt j...@kdbg.org When the todo sheet of interactive rebase instructs to run a non-existing command, the operation stops with the following error: Execution failed: no-such You can fix the problem, and then run git rebase --continue fatal: 'rebase' appears to be

Re: [PATCH] rebase -i: fix misleading error message after 'exec no-such' instruction

2012-09-18 Thread Matthieu Moy
Johannes Sixt j.s...@viscovery.net writes: From: Johannes Sixt j...@kdbg.org When the todo sheet of interactive rebase instructs to run a non-existing command, the operation stops with the following error: Execution failed: no-such You can fix the problem, and then run git

Can git pull from a mercurial repository?

2012-09-18 Thread Joachim Schmitz
Is there an easy way to get git to clone/pull from a Mercurial repository? Bye, Jojo -- 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

git installation fails in home directory on ubuntu 12.04

2012-09-18 Thread Stefan Beller
So I did git fetch git rebase git describe v1.7.12-503-g5976753 ./configure --prefix=/home/sb make make install GEN perl/PM.stamp SUBDIR gitweb SUBDIR ../ SUBDIR perl make[1]: `perl.mak' is up to date. make[2]: `GIT-VERSION-FILE' is up to date. GEN git-instaweb SUBDIR

Re: [PATCH] rebase -i: fix misleading error message after 'exec no-such' instruction

2012-09-18 Thread Johannes Sixt
Am 9/18/2012 13:20, schrieb Matthieu Moy: Johannes Sixt j.s...@viscovery.net writes: From: Johannes Sixt j...@kdbg.org When the todo sheet of interactive rebase instructs to run a non-existing command, the operation stops with the following error: Execution failed: no-such You can

Re: Can git pull from a mercurial repository?

2012-09-18 Thread Andreas Ericsson
On 09/18/2012 01:22 PM, Joachim Schmitz wrote: Is there an easy way to get git to clone/pull from a Mercurial repository? Yes. Google git remote helpers and you'll most likely find it. -- Andreas Ericsson andreas.erics...@op5.se OP5 AB www.op5.se

RE: Can git pull from a mercurial repository?

2012-09-18 Thread Joachim Schmitz
From: Georgi Chorbadzhiyski [mailto:g...@unixsol.org] Sent: Tuesday, September 18, 2012 2:06 PM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: Can git pull from a mercurial repository? Around 09/18/2012 02:22 PM, Joachim Schmitz scribbled: Is there an easy way to get git to

Re: Can git pull from a mercurial repository?

2012-09-18 Thread Georgi Chorbadzhiyski
Around 09/18/2012 02:22 PM, Joachim Schmitz scribbled: Is there an easy way to get git to clone/pull from a Mercurial repository? I'm using http://offbytwo.com/git-hg/ It works beautifully. -- Georgi Chorbadzhiyski http://georgi.unixsol.org/ -- To unsubscribe from this list: send the line

Re: Can git pull from a mercurial repository?

2012-09-18 Thread Andreas Schwab
Joachim Schmitz j...@schmitz-digital.de writes: Thanks, but that requires Mercurial to be available, installed and in PATH. I want to use git exactly because I don't have Mercurial (yet?) That doesn't make sense. If one wants to access a mercurial repository the best way to do that is to use

RE: Can git pull from a mercurial repository?

2012-09-18 Thread Joachim Schmitz
From: Andreas Schwab [mailto:sch...@linux-m68k.org] Sent: Tuesday, September 18, 2012 2:34 PM To: Joachim Schmitz Cc: 'Georgi Chorbadzhiyski'; git@vger.kernel.org Subject: Re: Can git pull from a mercurial repository? Joachim Schmitz j...@schmitz-digital.de writes: Thanks, but that

RE: Can git pull from a mercurial repository?

2012-09-18 Thread Joachim Schmitz
From: Andreas Ericsson [mailto:a...@op5.se] Sent: Tuesday, September 18, 2012 1:46 PM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: Can git pull from a mercurial repository? On 09/18/2012 01:22 PM, Joachim Schmitz wrote: Is there an easy way to get git to clone/pull from a

Re: Can git pull from a mercurial repository?

2012-09-18 Thread Andreas Schwab
Joachim Schmitz j...@schmitz-digital.de writes: Git can access cvs and svn repos, right? It uses the facilities provided by cvs and svn, respectively. And without having cvs/scv on the machine... Git does not reimplement either cvs nor svn. Andreas. -- Andreas Schwab,

Re: [PATCHv5] clone --single: limit the fetch refspec to fetched branch

2012-09-18 Thread Ralf Thielow
On Mon, Sep 17, 2012 at 11:39 PM, Junio C Hamano gits...@pobox.com wrote: Ralf Thielow ralf.thie...@gmail.com writes: - install correct refspec if the value of --branch is a tag (test added) What is the definition of correct? I see the documentation says --branch can also take tags and

Re: Remove all files except a few files, using filter-branch

2012-09-18 Thread Yi, EungJun
--index-filter git rm --cached -qr -- . git reset -q -- filename Hmm... I tried as you said, but it seems to lose history. In the below example, after rewriting there must be two commits for 'b' file but only one exists. ~$ git init filter-branch2 Initialized empty Git repository in

Re: Remove all files except a few files, using filter-branch

2012-09-18 Thread Johannes Sixt
Am 9/18/2012 17:01, schrieb Yi, EungJun: --index-filter git rm --cached -qr -- . git reset -q -- filename Hmm... I tried as you said, but it seems to lose history. I think it should be '... git reset -q $GIT_COMMIT -- filename' -- Hannes -- To unsubscribe from this list: send the line

Re: Remove all files except a few files, using filter-branch

2012-09-18 Thread Yi, EungJun
I think it should be '... git reset -q $GIT_COMMIT -- filename' It works! Thanks to Hannes and Andreas! On Wed, Sep 19, 2012 at 12:10 AM, Johannes Sixt j.s...@viscovery.net wrote: Am 9/18/2012 17:01, schrieb Yi, EungJun: --index-filter git rm --cached -qr -- . git reset -q -- filename

[PATCH] Documentation/git-filter-branch: Move note about effect of removing commits

2012-09-18 Thread Andreas Schwab
The note that explains that changes introduced by removed commits are preserved should be placed directly after the paragraph that describes such commits removal. Otherwise the reference to the commits appears out of context. Signed-off-by: Andreas Schwab sch...@linux-m68k.org ---

Re: [PATCHv5] clone --single: limit the fetch refspec to fetched branch

2012-09-18 Thread Junio C Hamano
Ralf Thielow ralf.thie...@gmail.com writes: IMO if a user uses clone --single-branch --branch tag, then he/she wants to have this tag only. Why should the next git fetch fetching something different? OK, I can buy that. -- To unsubscribe from this list: send the line unsubscribe git in the

Re: [PATCH/RFC] Port to HP NonStop

2012-09-18 Thread Junio C Hamano
Joachim Schmitz j...@schmitz-digital.de writes: From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Tuesday, September 18, 2012 9:57 AM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: [PATCH/RFC] Port to HP NonStop Joachim Schmitz j...@schmitz-digital.de writes: Needs a

RE: [PATCH/RFC] Port to HP NonStop

2012-09-18 Thread Joachim Schmitz
From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Tuesday, September 18, 2012 7:03 PM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: [PATCH/RFC] Port to HP NonStop Joachim Schmitz j...@schmitz-digital.de writes: From: Junio C Hamano [mailto:gits...@pobox.com] Sent:

Re: [PATCH] string_list API: document what sorted means.

2012-09-18 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: If another sort order is needed, then we will either have to audit existing string_list users to make sure that they don't rely on strcmp() ordering, or we will have to implement strcmp() ordering *plus* the new ordering. What I was envisioning

[PATCH] grep.c: Fix a sparse warning

2012-09-18 Thread Ramsay Jones
In particular, sparse complains that ... 'dump_grep_expression' was not declared. Should it be static?. In order to suppress the warning, since this function does not need more than file scope, we simply include the static modifier in it's declaration. Signed-off-by: Ramsay Jones

Re: git installation fails in home directory on ubuntu 12.04

2012-09-18 Thread Junio C Hamano
Stefan Beller stef...@web.de writes: So I did git fetch git rebase git describe v1.7.12-503-g5976753 ./configure --prefix=/home/sb make make install GEN perl/PM.stamp SUBDIR gitweb SUBDIR ../ SUBDIR perl make[1]: `perl.mak' is up to date. ... make[1]: Entering

Re: [PATCH/RFC] git-svn: use path accessor for Git::SVN objects

2012-09-18 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Eric Wong wrote: The accessors should improve maintainability and enforce consistent access to Git::SVN objects. Signed-off-by: Eric Wong normalper...@yhbt.net --- (RFC since I could've missed something) [...] git-svn.perl | 2 +-

Re: [PATCH] gitk: Synchronize highlighting in file view when scrolling diff

2012-09-18 Thread Peter Oberndorfer
On 2012-09-18 07:57, Stefan Haller wrote: Whenever the diff pane scrolls, highlight the corresponding file in the file list on the right. For a large commit with many files and long per-file diffs, this makes it easier to keep track of what you're looking at. Hi, i like this function! I have

Re: [PATCH] Documentation/git-filter-branch: Move note about effect of removing commits

2012-09-18 Thread Junio C Hamano
Andreas Schwab sch...@linux-m68k.org writes: The note that explains that changes introduced by removed commits are preserved should be placed directly after the paragraph that describes such commits removal. Otherwise the reference to the commits appears out of context. Signed-off-by:

Re: How to create the [PATCH 0/5] first email?

2012-09-18 Thread Jeff King
On Mon, Sep 17, 2012 at 05:36:35PM -0700, Junio C Hamano wrote: But note that using format-patch -s will break; it puts the sign-off below the ---. I think format-patch -s is a workflow mistake in the first place. You should be doing the sign-off the commit when you commit in the first

Re: git diff across submodules

2012-09-18 Thread Jens Lehmann
Am 18.09.2012 05:12, schrieb Kenny Simpson: Is there any nice way to get a diff and/or diffstat of both a project and its submodules between two revisions of the main project? Something like 'git diff --stat tag_a tag_b' but also including the diffstat on the submodule from the revision

Re: How to create the [PATCH 0/5] first email?

2012-09-18 Thread Junio C Hamano
Jeff King p...@peff.net writes: But even without that, I still think format-patch is a reasonable time to do it. It is the time when I proof-read my commit message and patch in its final form, and think do I really want to send this?. But it is not like I cannot sign off because I think it is

[PATCHv6] clone --single: limit the fetch refspec to fetched branch

2012-09-18 Thread Ralf Thielow
After running git clone --single, the resulting repository has the usual default +refs/heads/*:refs/remotes/origin/* wildcard fetch refspec installed, which means that a subsequent git fetch will end up grabbing all the other branches. Update the fetch refspec to cover only the singly cloned ref

Re: How to create the [PATCH 0/5] first email?

2012-09-18 Thread Jeff King
On Tue, Sep 18, 2012 at 12:11:58PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: But even without that, I still think format-patch is a reasonable time to do it. It is the time when I proof-read my commit message and patch in its final form, and think do I really want to

Re: git diff across submodules

2012-09-18 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: Am 18.09.2012 05:12, schrieb Kenny Simpson: Is there any nice way to get a diff and/or diffstat of both a project and its submodules between two revisions of the main project? Something like 'git diff --stat tag_a tag_b' but also including the

Re: git archive --format zip utf-8 issues

2012-09-18 Thread René Scharfe
Hello again, so two weeks have passed, and I've moved at a glacial pace towards a method how to measure compatibility of our generated ZIP files. Sorry, I just keep getting distracted. Anyway, the idea is to have a bunch of files with names using different scripts, zip them with several

Re: [PATCHv6] clone --single: limit the fetch refspec to fetched branch

2012-09-18 Thread Junio C Hamano
Ralf Thielow ralf.thie...@gmail.com writes: After running git clone --single, the resulting repository has the usual default +refs/heads/*:refs/remotes/origin/* wildcard fetch refspec installed, which means that a subsequent git fetch will end up grabbing all the other branches. Update the

Re: [PATCHv6] clone --single: limit the fetch refspec to fetched branch

2012-09-18 Thread Junio C Hamano
Ralf Thielow ralf.thie...@gmail.com writes: + ... + # explicit --single with tag + git clone --single-branch --branch two . dir_tag + + # advance both master and side branches + git checkout side + echo five file + git commit -a -m five + git checkout

[PATCH 1/2] archive-zip: support UTF-8 paths

2012-09-18 Thread René Scharfe
Set general purpose flag 11 if we encounter a path that contains non-ASCII characters. We assume that all paths are given as UTF-8; no conversion is done. Signed-off-by: Rene Scharfe rene.scha...@lsrfire.ath.cx --- Changes from previous version: Stop using has_non_ascii(), which does slightly

Re: How to create the [PATCH 0/5] first email?

2012-09-18 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Sep 18, 2012 at 12:11:58PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: But even without that, I still think format-patch is a reasonable time to do it. It is the time when I proof-read my commit message and patch in its final

Re: [PATCH] grep.c: Fix a sparse warning

2012-09-18 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk writes: In particular, sparse complains that ... 'dump_grep_expression' was not declared. Should it be static?. In order to suppress the warning, since this function does not need more than file scope, we simply include the static modifier in it's

Re: [PATCH] Documentation/git-filter-branch: Move note about effect of removing commits

2012-09-18 Thread Junio C Hamano
Andreas Schwab sch...@linux-m68k.org writes: Junio C Hamano gits...@pobox.com writes: So something like this instead? I agree it's even better. Andreas. Thanks for proofreading. I'll squash in the differences to your patch. -- To unsubscribe from this list: send the line unsubscribe git

[PATCH 2/2] archive-zip: declare creator to be Unix for UTF-8 paths

2012-09-18 Thread René Scharfe
The UTF-8 flag seems to be ignored by unzip unless we also mark the archive entry as coming from a Unix system. This is done by setting the field creator_version (version made by in the standard[1]) to 0x03NN. The NN part represents the version of the standard supported by us, and this patch

Re: How to create the [PATCH 0/5] first email?

2012-09-18 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com have anything to do with DCO in any case? Junio, What's DCO an abbreviation of? Philip -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at

Re: How to create the [PATCH 0/5] first email?

2012-09-18 Thread Jeff King
On Tue, Sep 18, 2012 at 12:47:36PM -0700, Junio C Hamano wrote: Jeff King p...@peff.net writes: But even without that, I still think format-patch is a reasonable time to do it. It is the time when I proof-read my commit message and patch in its final form, and think do I really want

Re: How to create the [PATCH 0/5] first email?

2012-09-18 Thread Jeff King
On Tue, Sep 18, 2012 at 09:10:26PM +0100, Philip Oakley wrote: From: Junio C Hamano gits...@pobox.com have anything to do with DCO in any case? What's DCO an abbreviation of? Developer's Certificate of Origin. See SubmittingPatches. -Peff -- To unsubscribe from this list: send the line

Re: [PATCH] rebase -i: fix misleading error message after 'exec no-such' instruction

2012-09-18 Thread Junio C Hamano
Johannes Sixt j.s...@viscovery.net writes: From: Johannes Sixt j...@kdbg.org When the todo sheet of interactive rebase instructs to run a non-existing command, the operation stops with the following error: Execution failed: no-such You can fix the problem, and then run git

Re: Gitweb characters not encoded/decoded properly

2012-09-18 Thread Drew Northup
On Mon, Sep 10, 2012 at 1:57 PM, Joseph Leong josephcle...@gmail.com wrote: Hi Everyone, I've noticed an issue in gitweb where git projects are created with characters such as: €酮خد㐁ᠡꀈ༑㘚.git But in the gitweb page content, URL section, a git project is rendered incorrectly? Example

Re: [PATCH 3/8] Doc: Improve shallow depth wording

2012-09-18 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Philip Oakley philipoak...@iee.org writes: Avoid confusion in compound sentence about the start of the commit set and the depth measure. Use two sentences. Dropping the first ',' after positive depth does not seem to make it any easier to read (I

Re: How to create the [PATCH 0/5] first email?

2012-09-18 Thread Wesley J. Landaker
On Monday, September 17, 2012 17:49:39 Junio C Hamano wrote: Philip Oakley philipoak...@iee.org writes: I then applied it (using git am) to a temp branch to see what it produced, and could repeat the cycle until the patches looked right. That's another obvious and valid way to prepare your

Re: [PATCH] Allow fancy globs in git-svn init branches

2012-09-18 Thread Eric Wong
Ammon Riley ammon.ri...@gmail.com wrote: Branches passed to 'git-svn init' via the -b/--branches flag automatically had a /* appended to them. When the branch contained a fancy glob with a {} pattern, this is incorrect behaviour, and leads to odd branches being created in the git repository.

Re: [PATCH v3 05/14] Change fetch_pack() and friends to take string_list arguments

2012-09-18 Thread Junio C Hamano
Jeff King p...@peff.net writes: What I think would be much more productive is breaking apart gigantic includes like cache.h into more reasonable modules, which would mean less frequent recompilation when an uninteresting part of the header changes. Ideally cache.h should cover what

Re: [PATCH] t/test-lib: print pretty msg when git isn't built

2012-09-18 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: When tests were run without building git, the following error message was displayed: .: 54: Can't open /path/to/git/source/t/../GIT-BUILD-OPTIONS Does the test stop due to this error, or it just goes on and hit another error? I am guessing

Re: [PATCH] t/test-lib: print pretty msg when git isn't built

2012-09-18 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Because that emits an ugly ./test-lib.sh: 54: /home/artagnon/src/git/t/../git: not found Don't you deserve it? ;-) The full message would read ./test-lib.sh: 54: /home/artagnon/src/git/t/../git: not found error: you do not seem to

Re: git archive --format zip utf-8 issues

2012-09-18 Thread Junio C Hamano
René Scharfe rene.scha...@lsrfire.ath.cx writes: WindowsInfo-ZIP unzip 7-Zip PeaZip builtin Linux msysgit Windows 7-Zip 9.20 0 0 4626 43 43 PeaZip 4.7.1 win64 0

Re: [PATCH] Make test output coloring more intuitive

2012-09-18 Thread Adam Spiers
On Mon, Sep 17, 2012 at 04:11:19PM -0400, Jeff King wrote: On Mon, Sep 17, 2012 at 12:50:37PM +0100, Adam Spiers wrote: The end result of these changes is that: - red is _only_ used for things which have gone unexpectedly wrong: test failures, unexpected test passes, and failures

Re: [PATCH 3/8] Doc: Improve shallow depth wording

2012-09-18 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Junio C Hamano gits...@pobox.com writes: Philip Oakley philipoak...@iee.org writes: Avoid confusion in compound sentence about the start of the commit set and the depth measure. Use two sentences. Dropping the first ',' after positive depth does not

Re: [PATCH] Make test output coloring more intuitive

2012-09-18 Thread Adam Spiers
On Mon, Sep 17, 2012 at 01:50:39PM -0700, Junio C Hamano wrote: Adam Spiers g...@adamspiers.org writes: 1. Change the color of individual known breakages from bold green to bold yellow. This seems more appropriate when considering the universal traffic lights coloring scheme, where

Confused by git am error message.

2012-09-18 Thread Philip Oakley
[a user confusion report] I was updating my patch series manually aand made a mistake, so the series didn't apply properly. However the error message confused me. ... Applying: Doc clean: add See Also links fatal: corrupt patch at line 17 Patch failed at 0008 Doc clean: add See

Re: [PATCH 3/8] Doc: Improve shallow depth wording

2012-09-18 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: And the simple corrections to patches 5/6/7 ? Shall I send? Juggling topics from many people, it is hard to keep track of how many out of how many patches in the original series are still relevant, so I would appreciate [PATCH vn N/M] with revamped

Re: [PATCH] Make test output coloring more intuitive

2012-09-18 Thread Jeff King
On Tue, Sep 18, 2012 at 10:36:17PM +0100, Adam Spiers wrote: + say_color error ok $test_count - $@ # TODO known breakage vanished } Also I wonder if this is still a TODO. Hah, I should trust my first instincts more; my first version of the patch dropped the TODO, but then I put it

Re: [PATCH] Make test output coloring more intuitive

2012-09-18 Thread Adam Spiers
On Tue, Sep 18, 2012 at 10:59 PM, Jeff King p...@peff.net wrote: TODO is a special token[1] respected by TAP harnesses like prove. I'm not sure what practical impact it has, but it should probably remain. -Peff [1] http://testanything.org/wiki/index.php/TAP_specification#TODO_tests Thanks,

Re: Confused by git am error message.

2012-09-18 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: [a user confusion report] I was updating my patch series manually aand made a mistake, so the series didn't apply properly. However the error message confused me. ... Applying: Doc clean: add See Also links fatal: corrupt patch at line 17

Re: [PATCH] Allow fancy globs in git-svn init branches

2012-09-18 Thread Ammon Riley
On Tue, Sep 18, 2012 at 1:46 PM, Eric Wong normalper...@yhbt.net wrote: Ammon Riley ammon.ri...@gmail.com wrote: Branches passed to 'git-svn init' via the -b/--branches flag automatically had a /* appended to them. When the branch contained a fancy glob with a {} pattern, this is incorrect

[ANNOUNCE] Git v1.7.12.1

2012-09-18 Thread Junio C Hamano
The latest maintenance release Git v1.7.12.1 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: c5227b5202947bba3d63dca72662fad02d208800 git-1.7.12.1.tar.gz

A note from the maintainer

2012-09-18 Thread Junio C Hamano
Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. * Mailing list and the community The development is primarily done on the Git mailing list. Help requests, feature proposals, bug reports

[PATCHv2 0/8] Small documentation updates

2012-09-18 Thread Philip Oakley
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'. V2 changes are in patches 3, 5, 6, and 7 The updated patches incorporate corrections and suggestions from Junio

[PATCHv2 1/8] Doc: Bundle file usage

2012-09-18 Thread Philip Oakley
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 diff --git

[PATCHv2 4/8] Doc: 'git' has a discussion section

2012-09-18 Thread Philip Oakley
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..d932a3e 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -30,6 +30,7 @@ After you

[PATCHv2 3/8] Doc: Improve shallow depth wording

2012-09-18 Thread Philip Oakley
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..d51e20f 100644 ---

[PATCHv2 6/8] Doc add: link gitignore

2012-09-18 Thread Philip Oakley
Use a gitignore link rather than the gitrepository- layout link. Signed-off-by: Philip Oakley philipoak...@iee.org diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 9c1d395..fd9e36b 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -155,7 +155,7 @@

[PATCHv2 7/8] Doc clean: add See Also link

2012-09-18 Thread Philip Oakley
'git clean' is controlled by gitignore. Provide See Also link for it. Use of core.excludesfile is implied. Signed-off-by: Philip Oakley philipoak...@iee.org diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt index 79fb984..9f42c0d 100644 --- a/Documentation/git-clean.txt +++

[PATCHv2 8/8] Doc branch: show -vv option and alternative

2012-09-18 Thread Philip Oakley
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 diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index

[PATCHv2 5/8] Doc: separate gitignore pattern sources

2012-09-18 Thread Philip Oakley
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..96639e0 100644 --- a/Documentation/gitignore.txt +++

[PATCHv2 2/8] Doc: shallow clone deepens _to_ new depth

2012-09-18 Thread Philip Oakley
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

Re: [PATCH v3 02/14] t5500: add tests of fetch-pack --all --depth=N $URL $REF

2012-09-18 Thread Philip Oakley
From: Michael Haggerty mhag...@alum.mit.edu Sent: Monday, September 10, 2012 10:53 PM On 09/10/2012 10:46 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: Document some bugs in git fetch-pack: 1. If git fetch-pack is called with --all, --depth, and an explicit existing

Re: [PATCHv2 1/8] Doc: Bundle file usage

2012-09-18 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: 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.

Re: [PATCH] gitk: Synchronize highlighting in file view when scrolling diff

2012-09-18 Thread Paul Mackerras
On Tue, Sep 18, 2012 at 07:57:54AM +0200, Stefan Haller wrote: Whenever the diff pane scrolls, highlight the corresponding file in the file list on the right. For a large commit with many files and long per-file diffs, this makes it easier to keep track of what you're looking at. I like this

Re: [PATCH] Allow fancy globs in git-svn init branches

2012-09-18 Thread Eric Wong
Ammon Riley ammon.ri...@gmail.com wrote: I confess that I'd completely forgot about the {} expansion in bash. Perhaps a note in the CAVEATS section of the documentation would be sufficient? I think so, yes. Can you send a patch for that instead? Thanks. -- To unsubscribe from this list: send

[PATCH] Documentation/git-blame.txt: --follow is a NO-OP

2012-09-18 Thread Drew Northup
Make note that while the --follow option is accepted by git blame it does nothing. Signed-off-by: Drew Northup n1xim.em...@gmail.com --- Documentation/git-blame.txt | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt

  1   2   >