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 usually
Signed-off-by: Junio C Hamano gits...@pobox.com
---
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
Signed-off-by: Junio C Hamano gits...@pobox.com
---
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
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 gits...@pobox.com
---
builtin/log.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
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
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,
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 usually
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
Junio C Hamano gits...@pobox.com 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
On Mon, Dec 17, 2012 at 4:18 AM, Junio C Hamano gits...@pobox.com wrote:
Adam Spiers g...@adamspiers.org 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
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 file is
Hi,
On Sat, Dec 22, 2012 at 01:21:18AM -0500, Eric S. Raymond wrote:
Heiko Voigt hvo...@hvoigt.net:
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
Heiko Voigt hvo...@hvoigt.net:
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$
Heiko Voigt hvo...@hvoigt.net:
Hi,
On Sat, Dec 22, 2012 at 01:21:18AM -0500, Eric S. Raymond wrote:
Heiko Voigt hvo...@hvoigt.net:
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
Antoine Pelisse apeli...@gmail.com:
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
Eric S. Raymond e...@thyrsus.com writes:
esr@snark:~/WWW/cvsps/fixrepos$ git clone http://repo.or.cz/w/cvsps-hv.git
From http://repo.or.cz/w/cvsps-hv.git:
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
Signed-off-by: Michael Schubert msc...@elegosoft.com
---
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
Signed-off-by: Michael Schubert msc...@elegosoft.com
---
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
+++
Antoine Pelisse apeli...@gmail.com 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:
Junio C Hamano venit, vidit, dixit 21.12.2012 17:58:
Michael J Gruber g...@drmicha.warpmail.net 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
Yngve Nysaeter Pettersen venit, vidit, dixit 21.12.2012 21:13:
On Fri, 21 Dec 2012 16:49:21 +0100, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Yngve Nysaeter Pettersen yn...@opera.com writes:
The split command will create a new repository for all files foo in a
folder (path/foo) and
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):
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 apeli...@gmail.com
---
I'm wondering if it would be needed to add a no-use-mailmap option to
log command
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
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 to
Andreas Schwab sch...@linux-m68k.org 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
Howto documents in howto-index.txt were listed in a rather
random order. So better sort them.
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
Documentation/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index
Adam Spiers g...@adamspiers.org 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
On Sat, Dec 22, 2012 at 4:31 PM, Toralf Förster toralf.foers...@gmx.de 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
Toralf Förster toralf.foers...@gmx.de 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
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
Thomas Ackermann th.ac...@arcor.de writes:
Howto documents in howto-index.txt were listed in a rather
random order. So better sort them.
Signed-off-by: Thomas Ackermann th.ac...@arcor.de
---
I think $(wildcard) used to sort but in recent GNU make it no longer
does, so this is probably a
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 asking for
On Fri, Dec 21, 2012 at 8:08 AM, Junio C Hamano gits...@pobox.com wrote:
David Aguilar dav...@gmail.com 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
Hi,
On Sat, Dec 22, 2012 at 5:41 AM, Earl Gresh egr...@codeaurora.org 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
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.
On Sat, Dec 22, 2012 at 11:57 PM, Junio C Hamano gits...@pobox.com wrote:
Andreas Schwab sch...@linux-m68k.org 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
On Sat, Dec 22, 2012 at 1:56 PM, David Aguilar dav...@gmail.com 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).
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
Martin von Zweigbergk martinv...@gmail.com 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
Martin von Zweigbergk martinv...@gmail.com 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))
-
Antoine Pelisse apeli...@gmail.com 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 apeli...@gmail.com
---
I'm wondering if it would be
On Sat, Dec 22, 2012 at 7:24 PM, Junio C Hamano gits...@pobox.com wrote:
Martin von Zweigbergk martinv...@gmail.com 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
On Sun, Dec 23, 2012 at 7:24 AM, Martin von Zweigbergk
martinv...@gmail.com 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
44 matches
Mail list logo
