Re: [PATCH 2/2] learn to pick/revert into unborn branch

On Sun, Dec 23, 2012 at 7:24 AM, Martin von Zweigbergk wrote: > > As for use cases, I didn't consider that much more than that it might > be useful for implementing "git rebase --root". I haven't implemented > that yet, so I can't say for sure that it will work out. > > One use case might be to re

Re: [PATCH 2/2] learn to pick/revert into unborn branch

On Sat, Dec 22, 2012 at 7:24 PM, Junio C Hamano wrote: > Martin von Zweigbergk writes: > >>>From the user's point of view, it seems natural to think that >> cherry-picking into an unborn branch should work, so make it work, >> with or without --ff. > > I actually am having a hard time imagining h

Re: [PATCH 2/2] log: add log.mailmap configuration option

Antoine Pelisse writes: > This patch provides a new configuration option 'log.mailmap' to > automatically use the --use-mailmap option from git-show, git-log and > git-whatchanged commands. > > Signed-off-by: Antoine Pelisse > --- > I'm wondering if it would be needed to add a no-use-mailmap opt

Re: [PATCH 2/2] learn to pick/revert into unborn branch

Martin von Zweigbergk writes: > @@ -435,8 +437,9 @@ static int do_pick_commit(struct commit *commit, struct > replay_opts *opts) > else > parent = commit->parents->item; > > - if (opts->allow_ff && parent && !hashcmp(parent->object.sha1, head)) > - return fa

Re: [PATCH 2/2] learn to pick/revert into unborn branch

Martin von Zweigbergk writes: >>From the user's point of view, it seems natural to think that > cherry-picking into an unborn branch should work, so make it work, > with or without --ff. I actually am having a hard time imagining how that could ever be natural. When you are on an unborn branch,

[ANNOUNCE] Git v1.8.1-rc3

A release candidate Git v1.8.1-rc3 is now available for testing 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: c0ad509fb6a91babc43cf790405dbd95c68c986f git-1.8.1.rc3.tar.gz 8396960d1e4384a861f98cdd29e2

Re: [PATCH v2] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

On Sat, Dec 22, 2012 at 1:56 PM, David Aguilar wrote: > FWIW I'm seeing a "Bus Error" when doing "git update-index --refresh" > in a repository with large files on a 32bit machine. I'm not sure if > that counts as a regression since the same error occurs in 1.7.10.4 > (debian testing). > > I'll st

Re: Pushing symbolic references to remote repositories?

On Sat, Dec 22, 2012 at 11:57 PM, Junio C Hamano wrote: > Andreas Schwab writes: > >> This is not limited to HEAD, any ref may want to be set up as a symref >> at a remote repo. For example, I want to set up a symref master -> >> trunk at a repository I have no shell access to. > > That is exact

Re: Missing Refs after Garbage Collection

On Fri, Dec 21, 2012 at 05:41:43PM -0800, Earl Gresh wrote: > I have observed that after running GC, one particular git repository > ended up with some missing refs in the refs/changes/* namespace the > Gerrit uses for storing patch sets. The refs were valid and should not > have been pruned. Conc

Push Windows to Linux Repository Problem

I think I have my Linux central repository set up correctly. I can pull and push from/to the repository on the Linux host itself. My problem is trying to push commits to that repository from windows. I keep getting "fatal: Could not read from remote repository." When I run 'ls' commands using plin

Re: Missing Refs after Garbage Collection

Hi, On Sat, Dec 22, 2012 at 5:41 AM, Earl Gresh wrote: > > Is anyone familiar with git gc deleting valid references? I'm running > git version 1.7.8. Have there been any patches in later git releases > that might address this issue ( if it is a git problem )? I have not seen any relevant changes

Re: [PATCH v2] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

On Fri, Dec 21, 2012 at 8:08 AM, Junio C Hamano wrote: > David Aguilar writes: > >> Use $TMPDIR when creating the /dev/null placeholder for p4merge. >> This keeps it out of the current directory. > > The usual $REMOTE "this is theirs" and $LOCAL "this is ours" are > still created in the current d

Aw: Re: [PATCH] Sort howto documents in howto-index.txt

> > I think $(wildcard) used to sort but in recent GNU make it no longer > does, so this is probably a good change. > > Do we need to explicitly sort the api-index as well? $(API_DOCS) is > fed to the script that reads filenames one at a time in the given > order, but I do not see anybody askin

Re: [PATCH] Sort howto documents in howto-index.txt

Thomas Ackermann writes: > Howto documents in howto-index.txt were listed in a rather > random order. So better sort them. > > Signed-off-by: Thomas Ackermann > --- I think $(wildcard) used to sort but in recent GNU make it no longer does, so this is probably a good change. Do we need to expli

Hold your fire, please

Primarily in order to force me concentrate on the releng for the upcoming release, and also to encourage contributors to focus on finding and fixing any last minute regressions (rather than distracting others by showing publicly scratching their itches), I won't be queuing any patch that is not a r

Re: problem with BOINC repository and CR/LF

Toralf Förster writes: > On 12/18/2012 05:41 PM, Jeff King wrote: >> I could reproduce it, too, on Linux. >> >> The reason it does not always happen is that git will not re-examine the >> file content unless the timestamp on the file is older than what's in >> the index. So it is a race conditio

Re: problem with BOINC repository and CR/LF

On Sat, Dec 22, 2012 at 4:31 PM, Toralf Förster wrote: > > /me still wonders whether this race condition is a feature or an issue > in GIT - b/c it means that 2 different people cloning the same > repository get different results. The problem is that Git assumes that conversion from git to the wo

Re: [PATCH 3/3] Makefile: use -Wdeclaration-after-statement if supported

Adam Spiers writes: > Fair enough, but let's not allow perfect to become the enemy of good. That is why I would prefer a solution without any false positive while allowing false negatives, i.e. not force everybody to use these flags without giving a way to turn them off. You could perhaps sell

[PATCH] Sort howto documents in howto-index.txt

Howto documents in howto-index.txt were listed in a rather random order. So better sort them. Signed-off-by: Thomas Ackermann --- Documentation/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index d7417b8..ff8ad9a 100

Re: Pushing symbolic references to remote repositories?

Andreas Schwab writes: > This is not limited to HEAD, any ref may want to be set up as a symref > at a remote repo. For example, I want to set up a symref master -> > trunk at a repository I have no shell access to. That is exactly the "hosting side does not give you an easy way so pushing seem

Re: Right way to import a repo

Florian Lindner venit, vidit, dixit 21.12.2012 17:11: > Hello, > > I have two repositories. tools and flof. I want to merge flof into tools (and > flof will be deleted after that) while keeping history intact. Of course I've > googled that and found a number of different solution which all seem

[PATCH 1/2] log: grep author/committer using mailmap

Currently mailmap can be used to display log authors and committers but there no way to use mailmap to find commits with mapped values. This commit allows those commands to work: git log --use-mailmap --author mapped_name_or_email git log --use-mailmap --committer mapped_name_or_email Of

[PATCH 2/2] log: add log.mailmap configuration option

This patch provides a new configuration option 'log.mailmap' to automatically use the --use-mailmap option from git-show, git-log and git-whatchanged commands. Signed-off-by: Antoine Pelisse --- I'm wondering if it would be needed to add a no-use-mailmap option to log command so that it can cance

[PATCH 0/2] Mailmap in log improvements

The goal of these patches are to: - allow the use of mailmap when looking for commits authored/committed by a mapped name/email. - add an option so that --use-mailmap option can be used automatically. Tests are included. This series is based on ap/log-mailmap. Antoine Pelisse (2): lo

Re: Opera release Git-splitter, a sub-modularizing tool for Git

Yngve Nysaeter Pettersen venit, vidit, dixit 21.12.2012 21:13: > On Fri, 21 Dec 2012 16:49:21 +0100, Matthieu Moy > wrote: > >> "Yngve Nysaeter Pettersen" writes: >> >>> The split command will create a new repository for all files foo in a >>> folder (path/foo) and their commit history. >>> >>

Re: [BUG] Cannot push some grafted branches

Junio C Hamano venit, vidit, dixit 21.12.2012 17:58: > Michael J Gruber writes: > >> While replace refs are much more general than grafts, it seems the two >> main uses are: >> >> - grafts (change the recorded parents for a commit) >> - svn cleanup (convert tagging commits into tag objects) >> >>

Re: Change in cvsps maintainership, abd a --fast-export option

Antoine Pelisse writes: > I guess 'w' means write No, 'w' mean gitweb. 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 "unsu

[PATCH] git-subtree: fix typo in manpage

Signed-off-by: Michael Schubert --- contrib/subtree/git-subtree.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index 0c44fda..c5bce41 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-s

[PATCH] git-subtree: ignore git-subtree executable

Signed-off-by: Michael Schubert --- contrib/subtree/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore index 7e77c9d..91360a3 100644 --- a/contrib/subtree/.gitignore +++ b/contrib/subtree/.gitignore @@ -1,4 +1,5 @@ *~ +git-subtr

Re: Change in cvsps maintainership, abd a --fast-export option

"Eric S. Raymond" writes: > esr@snark:~/WWW/cvsps/fixrepos$ git clone http://repo.or.cz/w/cvsps-hv.git >From : URL git://repo.or.cz/cvsps-hv.git http://repo.or.cz/r/cvsps-hv.git Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58

Re: Re: Change in cvsps maintainership, abd a --fast-export option

Antoine Pelisse : > > esr@snark:~/WWW/cvsps/fixrepos$ git clone http://repo.or.cz/w/cvsps-hv.git > > Cloning into 'cvsps-hv'... > > fatal: http://repo.or.cz/w/cvsps-hv.git/info/refs not valid: is this a git > > repository? > > I guess 'w' means write, and you don't have write access. You should u

Re: Re: Re: Change in cvsps maintainership, abd a --fast-export option

Heiko Voigt : > Hi, > > On Sat, Dec 22, 2012 at 01:21:18AM -0500, Eric S. Raymond wrote: > > Heiko Voigt : > > > Back then when I was converting some repositories to git and I also > > > wrote a quick testsuite for cvsps in an attempt to fix the bugs but gave > > > up. That was the point when I wr

Re: Re: Change in cvsps maintainership, abd a --fast-export option

Heiko Voigt : > My commits can be found here: > > http://repo.or.cz/w/cvsps-hv.git > > I just quickly checked and it seems that it does not run cleanly on a > modern Linux anymore. If it is of interest to you I can try to get it > running again. esr@snark:~/WWW/cvsps/fixrepos$ git clone ht

Re: Re: Re: Change in cvsps maintainership, abd a --fast-export option

Hi, On Sat, Dec 22, 2012 at 01:21:18AM -0500, Eric S. Raymond wrote: > Heiko Voigt : > > Back then when I was converting some repositories to git and I also > > wrote a quick testsuite for cvsps in an attempt to fix the bugs but gave > > up. That was the point when I wrote about cvsimports limitat

Re: problem with BOINC repository and CR/LF

On 12/18/2012 05:41 PM, Jeff King wrote: > I could reproduce it, too, on Linux. > > The reason it does not always happen is that git will not re-examine the > file content unless the timestamp on the file is older than what's in > the index. So it is a race condition for git to see whether the fil

Re: [PATCH 3/3] Makefile: use -Wdeclaration-after-statement if supported

On Mon, Dec 17, 2012 at 4:18 AM, Junio C Hamano wrote: > Adam Spiers writes: > >> OK; I expect these issues with the implementation are all >> surmountable. I did not necessarily expect this to be the final >> implementation anyhow, as indicated by my comments below the divider >> line. However

Re: Pushing symbolic references to remote repositories?

Junio C Hamano writes: > I think that the only one and a half sensible use cases that > unconditionally make sense to update symrefs across repositories are > to update bare.git/HEAD symref: > > - update bare.git/HEAD of a repository that is a local mirror of a >more authoritative repository

[PATCH 7/7] format-patch: add --reroll-count=$N option

The --reroll-count=$N option, when given a positive integer: - Adds " v$N" to the subject prefix specified. As the default subject prefix string is "PATCH", --reroll-count=2 makes it "PATCH v2". - Prefixes "v$N-" to the names used for output files. The cover letter, whose name is usu

[PATCH 5/7] get_patch_filename(): drop "just-numbers" hack

The function chooses from three operating modes (format using the subject, the commit, or just number) based on NULL-ness of two of its parameters, which is an ugly hack for sharing only a bit of code. Separate out the "just numbers" part out to the callers. Signed-off-by: Junio C Hamano --- bu

[PATCH 4/7] get_patch_filename(): simplify function signature

Most functions that emit to a strbuf take the strbuf as their first parameter; make this function follow suit. The serial number of the patch being emitted (nr) and suffix used for patch filename (suffix) are both recorded in rev_info; drop these separate parameters and pass the rev_info directly.

[PATCH 6/7] get_patch_filename(): split into two functions

The function switched between two operating modes depending on the NULL-ness of its two parameters, as a hacky way to share small part of implementation, sacrificing cleanliness of the API. Implement "fmt_output_subject()" function that takes a subject string and gives the name for the output file

[PATCH 3/7] builtin/log.c: stop using global patch_suffix

The suffix for the output filename is found in rev->patch_suffix; do not keep using the global that is only used to parse the command line and configuration. Signed-off-by: Junio C Hamano --- builtin/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/log.c b/bu

[PATCH 2/7] builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()

Signed-off-by: Junio C Hamano --- builtin/log.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index 28d9063..f1d086e 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -768,7 +768,6 @@ static void add_branch_description(struct strbu

[PATCH 1/7] builtin/log.c: drop unused "numbered" parameter from make_cover_letter()

Signed-off-by: Junio C Hamano --- builtin/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index 09cf43e..28d9063 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -768,7 +768,7 @@ static void add_branch_description(struct strbuf *buf, c

[PATCH 0/7] format-patch --reroll-count

The --reroll-count=$N option, when given a positive integer: - Adds " v$N" to the subject prefix specified. As the default subject prefix string is "PATCH", --reroll-count=2 makes it "PATCH v2". - Prefixes "v$N-" to the names used for output files. The cover letter, whose name is usu