login
Header Space

 
 

git mailing list

FromSubjectsort iconDate
Shawn O. Pearce
[JGIT PATCH 1/1] Fix local transport to invoke git-upload-pa...
We need to use git-upload-pack, not git-receive-pack. This was broken by accident in 57aa472a7ef5e9349c4c0aa1a3022a1e28499324. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- .../org/spearce/jgit/transport/TransportLocal.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/TransportLocal.java b/org.spearce.jgit/src/org/spearce/jgit/transport/TransportLocal.java index b41d4af..155d59f 100644 --- a/org.spearc...
Jul 6, 7:31 pm 2008
Robin Rosenberg
[JGIT PATCH 1/1] jgit: create a tag command
This command allows us to create simple or annotated tags using the jgit command line. PGP signed tags are not yet supported. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> --- I ned this for tagging self-jgit-managed automated builds of the Eclipse plugin. I could do with an Ant task, but this will work too. -- robin org.spearce.jgit/src/org/spearce/jgit/pgm/Tag.java | 96 ++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) create mode 100644 org.spe...
Jul 6, 6:41 pm 2008
Robin Rosenberg
Re: [JGIT PATCH 1/1] jgit: create a tag command
This command allows us to create simple or annotated tags. PGP signed tags are not yet supported. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> --- org.spearce.jgit/src/org/spearce/jgit/pgm/Tag.java | 102 ++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 deletions(-) create mode 100644 org.spearce.jgit/src/org/spearce/jgit/pgm/Tag.java An obvious omission was not to allow the user to tag anything but HEAD. diff --git a/org.spearce.jgit/src/org/spearce/jgit/pg...
Jul 6, 7:16 pm 2008
Brian Gernhardt
[FIXED PATCH] Make rebase save ORIG_HEAD if changing current...
This makes rebase act a little more like merge when working on the current branch. This is particularly useful for `git pull --rebase` Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> --- ARG! This is what v3 was supposed to be. I should make sure I am sending in the correct patch. (Tip: run format-patch again after a commit --amend.) Bad weekend for me, apparently trying to do too many things at once. Sorry for all the noise. To recap: If I followed the discussio...
Jul 6, 5:22 pm 2008
Nathan Kontny
git/refs/heads/master was not found in commit?
I'm a newb to git. I'm trying to "git svn clone" a tried and true subversion repo but it fails after scanning the 2069 commit, and spits out: vendor/plugins/locking/.git/refs/heads/master was not found in commit 484775a7dc66b9c91188a5ad52c30c371ff8d702 (r2068) Which is right. It isn't in 2068, it was checked in at 2069. The 2069 commit was some code I had "git clone"d from github into a subfolder of the parent project that's checked into subversion. I've tried to replicate this behavior...
Jul 6, 4:53 pm 2008
Mikael Magnusson
[PATCH] Fix grammar in git-rev-parse(1).
--- Documentation/git-rev-parse.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 59e95ad..ba65bfa 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -301,9 +301,9 @@ It is the set of commits that are reachable from either one of `r1` or `r2` but not from both. Two other shorthands for naming a set that is formed by a commit -and its parent commits exists....
Jul 6, 4:34 pm 2008
Stephan Beyer
[HACK] t/test-lib.sh HACK: Add -s/--show-hack to test suite.
This option realizes a stupid hack that tries to run the test cases line by line (separated by &&). Furthermore it shows the line it is testing. With that information it is easier to find the reason why a test fails. This hack works as long as there are no multi-line for/while/subshell/... in the test cases. Note, that the -s option should only be used if a test case failed. It is slow and error-prone. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> --- Hi, I wrote that befo...
Jul 6, 4:22 pm 2008
Johannes Schindelin
Re: [HACK] t/test-lib.sh HACK: Add -s/--show-hack to test su...
Hi, In what way is that better than "sh -x t????-*.sh"? Ciao, Dscho --
Jul 6, 4:41 pm 2008
Junio C Hamano
Re: [PATCH] Add a test for "git stash branch"
Oh, there is no misunderstanding. You couldn't have possibly known if the main body of the patch will go to 'next' or just be dropped when I said The title is probably not 'stash apply' but 'stash branch'. Don't you want to also validate that: - "stash branch" command switched to the new branch "stashbranch"? - before making "alternate second", the index and the working tree have expected contents? and - the final shape of the history looks correctly forked (i.e. "stashbranch" ...
Jul 6, 3:53 pm 2008
Abhijit Menon-Sen
[PATCH v2] Add a test for "git stash branch"
Make sure that applying the stash to a new branch after a conflicting change doesn't result in an error when you try to commit. Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> --- Done. -- ams t/t3903-stash.sh | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 54d99ed..bd1cdab 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -117,4 +117,65 @@ test_exp...
Jul 6, 5:20 pm 2008
Gerrit Pape
[PATCH/rfc] git-svn.perl: workaround assertions in svn libra...
With subversion 1.5.0 (C and perl libraries) the git-svn selftest t9101-git-svn-props.sh fails at test 25 and 26. The following commands cause assertions in the svn library $ cd deeply $ git-svn propget svn:ignore . perl: /build/buildd/subversion-1.5.0dfsg1/subversion/libsvn_ra/ra_loader.c:674: svn_ra_get_dir: Assertion `*path != '/'' failed. Aborted $ git-svn propget svn:ignore .. perl: /build/buildd/subversion-1.5.0dfsg1/subversion/libsvn_subr/path.c:120: svn_path_join: Assertion `is_ca...
Jul 6, 3:28 pm 2008
Linus Torvalds
'git am' breakage with MIME decoding
Ok, so I generally try to avoid MIME-encoded emails because my old legacy tools didn't handle them, but since 'git am' is supposed to be able to handle them, I just tried one. And it failed. Un-encoding them in the email client and then re-doing the thing worked fine, so it's definitely related to the MIME-decoding somehow. I'm attaching both versions of the email so people can test it out (it applies to v2.6.26-rc9 of the kernel), but the behaviour in short is that the plain version (ie t...
Jul 6, 1:47 pm 2008
Don Zickus
[PATCH] git-mailinfo may corrupt patch headers on attached f...
Boundary lines in emails are treated as a special case. As a result of processing the boundary line a new line will be read into the buffer. The string length variable 'len' is evaluated before the boundary case, thus there is the possibility the length of the string does not match the new line read in (in the boundary line case). This causes a partial output of the line to the patch file. The fix is trivial, evaluate the length of the string right before processing it. Signed-off-by: Don Zi...
Jul 6, 5:21 pm 2008
Junio C Hamano
Re: [PATCH] git-mailinfo may corrupt patch headers on attach...
Ah, I was about to bisect this to see where it needs to be fixed and if it needs to be fixed in maint (or maint-1.5.5 and earlier). Thanks for doing this before I got around to it. --
Jul 6, 6:13 pm 2008
Linus Torvalds
Re: [PATCH] git-mailinfo may corrupt patch headers on attach...
Ack. This patch does indeed seem to fix the test-case I had. Thanks, Linus --
Jul 6, 5:52 pm 2008
Ittay Dror
something like 'find' in revisions
Hi, How can I find files with a given name (or pattern) in my history (where I don't know the exact path and some files have been removed)? Thank you, Ittay -- -- Ittay Dror <ittay.dror@gmail.com> --
Jul 6, 7:05 am 2008
Johannes Schindelin
Re: something like 'find' in revisions
Hi, I'd grep in the output of "git rev-list --objects". Then I'd have the full name, and "git log --all -- <fullpath>" is my friend. Ciao, Dscho --
Jul 6, 8:53 am 2008
Junio C Hamano
What's cooking in git.git (topics)
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. The topics list the commits in reverse chronological order. The topics meant to be applied to the maintenance series have "maint-" in their names. It already is beginning to become clear what 1.6.0 will look like. What's already in 'next' all are well intentioned (I do not guarantee they are already bug-free --- that is what cooking them in 'next' is for) and a...
Jul 6, 6:04 am 2008
Johannes Schindelin
Re: What's cooking in git.git (topics)
Hi, If we want to call this "--directory=<root>" instead, we should do it before that commit hits master. Ciao, Dscho --
Jul 6, 7:10 am 2008
Junio C Hamano
What's in git.git (stable)
With accumulated fixes, the latest maintenance release 1.5.6.2 is out. On the 'master' front, port to MinGW has now been merged, and the next major release 1.6.0 is already taking shape. ---------------------------------------------------------------- * The 'master' branch has these since the last announcement in addition to what is in maint. Adam Brewster (1): Move read_revisions_from_stdin from builtin-rev-list.c to revision.c Brian Gernhardt (1): Documentation: Point to gitcli(7) f...
Jul 6, 6:04 am 2008
Brian Gernhardt
[PATCH] branch -v: Prevent garbage output on remote refs
The stat string was only initialized if the ref was local, but was always used in a printf. This meant that whatever data was on the stack got printed. In the case of "branch -av", this was probably the tracking information of the last local branch. If the case of "branch -rv", this was "@???" in my case. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> --- After looking through the second get of changes I pulled, I tried this: $ git branch -av * master 31...
Jul 6, 5:24 am 2008
Junio C Hamano
Re: [PATCH] branch -v: Prevent garbage output on remote refs
Thanks, but I have pushed out a slightly different change. -- >8 -- branch -r -v: do not spit out garbage The codepath to emit relationship between the branch and what it tracks forgot to initialize a string buffer stat[] to empty when showing a tracking branch. This moves the emptying so that the buffer starts as empty and stays so when no information is added to fix this issue. Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin-branch.c | 5 ++--- 1 files changed...
Jul 6, 6:07 am 2008
Brian Gernhardt
Re: [PATCH] branch -v: Prevent garbage output on remote refs
Looks good, and more importantly works. Cherry-picked it from pu onto next. Hopefully it'll move there on it's own soon. ~~ Brian --
Jul 6, 12:13 pm 2008
Brian Gernhardt
[PATCH v2] Make rebase save ORIG_HEAD if changing current br...
This makes rebase act a little more like merge when working on the current branch. This is particularly useful for `git pull --rebase` Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> --- If I followed the discussion the last time I sent this in correctly, the two issues were: - Ugly "echo > ORIG_HEAD" instead of pretty "git update-ref ORIG_HEAD" - Setting ORIG_HEAD at the wrong place Let me know if there are any other issues. git-rebase.sh | 1 + 1 files chan...
Jul 6, 4:40 am 2008
Brian Gernhardt
[PATCH v3] Make rebase save ORIG_HEAD if changing current br...
This makes rebase act a little more like merge when working on the current branch. This is particularly useful for `git pull --rebase` Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> --- Okay, I apparently should stop coding after midnight, even if I think I'm awake enough. This version uses the correct variable. $orig_head looks like the right name, but it stores the symbolic ref. $prev_head stores the actual SHA1, which is what I was looking for. git-rebase.sh | 1...
Jul 6, 12:16 pm 2008
Brian Gernhardt
Commit message for 1240f94 has mail headers
The commit message for 1240f94 (next~2^2~1 in my repo) reads as follows: ----- 8< ----- Add new test case to ensure git-merge prepends the custom merge message 7b9b8a456462c83.1214581610.git.vmiklos@frugalware.org> In-Reply-To: <cover.1214581610.git.vmiklos@frugalware.org> References: <cover.1214581610.git.vmiklos@frugalware.org> X-Pobox-Pass: vmiklos@frugalware.org is whitelisted X-ICG-Account-ID: 77302942 Xref: gitster.siamese.dyndns.org ...
Jul 6, 4:00 am 2008
Miklos Vajna
Re: Commit message for 1240f94 has mail headers
On Sun, Jul 06, 2008 at 04:00:23AM -0400, Brian Gernhardt <benabik@silverin= My fault, I noticed it but I forgot to send a reminder about it before it hit next. Sorry. (I suppose it won't be fixed, unless merge-in-c won't hit master before 1.6.0, which is hopefully unlikely. ;-) )
Jul 6, 5:19 pm 2008
Junio C Hamano
[ANNOUNCE] GIT 1.5.6.2
The latest maintenance release GIT 1.5.6.2 are available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.5.6.2.tar.{gz,bz2} (source tarball) git-htmldocs-1.5.6.2.tar.{gz,bz2} (preformatted docs) git-manpages-1.5.6.2.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are also provided as courtesy. As the machine I cut them at kernel.org has been updated to FC9 recently, their filenames now have .fc9. in them. RPMS/$arch/git-...
Jul 6, 1:34 am 2008
Jan Engelhardt
Re: [ANNOUNCE] GIT 1.5.6.2
Three git versions? --
Jul 6, 8:44 am 2008
Mikael Magnusson
Re: [ANNOUNCE] GIT 1.5.6.2
I believe this is related to moving to the dash-less form of receive-pack et al. -- Mikael Magnusson --
Jul 6, 10:54 am 2008
Jakub Narebski
Re: [ANNOUNCE] GIT 1.5.6.2
This unfortunately includes also SRPMS (.src.rpm), even though the source RPM from git repository is not distribution specific. I think that src.rpm should drop '.fc9.' from name -- Jakub Narebski Poland ShadeHawk on #git --
Jul 6, 4:09 am 2008
Junio C Hamano
Re: [ANNOUNCE] GIT 1.5.6.2
It is whatever rpmbuild command does. Not my problem. Having said that, I vaguely recall some people from non Fedora nor RH distros based on RPM were talking about how their .spec file would be different from the one for FC. Presumably the resulting SRPM would be also distro specific, wouldn't it? --
Jul 6, 5:30 am 2008
Miklos Vajna
[PATCH] INSTALL: Update section about git-frotz form.
The old text stated that 'git-frotz' can be always used instead of 'git frotz' which is no longer true. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> --- INSTALL | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/INSTALL b/INSTALL index 4a4e13f..0efb4b7 100644 --- a/INSTALL +++ b/INSTALL @@ -27,20 +27,14 @@ Issues of note: - git normally installs a helper script wrapper called "git", which conflicts with a similarly named "GNU intera...
Jul 6, 12:28 am 2008
Johannes Schindelin
Re: [PATCH] INSTALL: Update section about git-frotz form.
Hi, This: ^ ^ ^ ^ ^ ^ ^ ^ ^ somehow contradict each other. Maybe kill the whole sentence containing 1997? Ciao, Dscho --
Jul 6, 7:14 am 2008
Christian Couder
[PATCH] Fix "config_error_nonbool" used with value instead o...
The function "config_error_nonbool", that is defined in "config.c", is used to report an error when a config key in the config file should have a corresponding value but it hasn't. So the parameter to this function should be the key and not the value, because the value is undefined. And it could crash if the value is used. This patches fixes two occurences where the value was passed instead of the key. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- builtin-tag.c | 2 ...
Jul 6, 12:10 am 2008
Miklos Vajna
[PATCH 0/5] hg-to-git fixes
Hi, I just noticed that hg-to-git was not updated to use dash-less git commands, which now causes problems on 'next'. If I was at it, I fixed a few minor issues I noticed as well. Miklos Vajna (5): hg-to-git: avoid raising a string exception hg-to-git: abort if the project directory is not a hg repo hg-to-git: rewrite "git-frotz" to "git frotz" hg-to-git: use git init instead of git init-db hg-to-git: use git rev-parse instead of git show contrib/hg-to-git/hg-to-git.py | 27 ++++...
Jul 5, 11:15 pm 2008
Miklos Vajna
[PATCH 1/5] hg-to-git: avoid raising a string exception
This fixes the following warning: hg-to-git.py:92: DeprecationWarning: raising a string exception is deprecated Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> --- contrib/hg-to-git/hg-to-git.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py index f68ef72..25d9941 100755 --- a/contrib/hg-to-git/hg-to-git.py +++ b/contrib/hg-to-git/hg-to-git.py @@ -89,7 +89,7 @@ try: if o in ('-v', '-...
Jul 5, 11:15 pm 2008
Miklos Vajna
[PATCH 2/5] hg-to-git: abort if the project directory is not...
Check the exit code of the first hg command, and abort to avoid a later ValueError exception. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> --- contrib/hg-to-git/hg-to-git.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py index 25d9941..130b1c4 100755 --- a/contrib/hg-to-git/hg-to-git.py +++ b/contrib/hg-to-git/hg-to-git.py @@ -106,7 +106,10 @@ if state: else: print 'State...
Jul 5, 11:15 pm 2008
Miklos Vajna
[PATCH 3/5] hg-to-git: rewrite "git-frotz" to "git frotz"
This is not just nice but necessary since git-frotz is no longer in PATH. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> --- contrib/hg-to-git/hg-to-git.py | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py index 130b1c4..61540ef 100755 --- a/contrib/hg-to-git/hg-to-git.py +++ b/contrib/hg-to-git/hg-to-git.py @@ -152,7 +152,7 @@ for cset in range(1, int(tip) + 1): if not ...
Jul 5, 11:15 pm 2008
Miklos Vajna
[PATCH 4/5] hg-to-git: use git init instead of git init-db
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> --- contrib/hg-to-git/hg-to-git.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py index 61540ef..7b03204 100755 --- a/contrib/hg-to-git/hg-to-git.py +++ b/contrib/hg-to-git/hg-to-git.py @@ -152,7 +152,7 @@ for cset in range(1, int(tip) + 1): if not hgvers.has_key("0"): print 'creating repository' - os.system('git init-db') + os.sys...
Jul 5, 11:15 pm 2008
Miklos Vajna
[PATCH 5/5] hg-to-git: use git rev-parse instead of git show
'show' is a high-level command, scripts are better if they use 'rev-parse'. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> --- contrib/hg-to-git/hg-to-git.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py index 7b03204..0ecb38b 100755 --- a/contrib/hg-to-git/hg-to-git.py +++ b/contrib/hg-to-git/hg-to-git.py @@ -233,7 +233,7 @@ for cset in range(int(tip) + 1): os.system('git branch -...
Jul 5, 11:15 pm 2008
Junio C Hamano
Re: Teach git-bundle to read revision arguments from stdin l...
Hmm, do we deeply care about this case? What bad things coulc happen if --
Jul 5, 8:57 pm 2008
Adam Brewster
Re: Teach git-bundle to read revision arguments from stdin l...
Presently, it'll actually try to read stdin twice and that won't work. Also, if you want git-bundle to deal with --stdin --stdin, I'd say that git-rev-list should do the same. I don't really care how this particular error case is handled, but I think git-rev-list and git-bundle should do the same thing for any given input. If you prefer to be liberal in what you accept, then you might like these two patches that allow git-rev-list and git-bundle to deal with --stdin --stdin. By the w...
Jul 6, 10:28 am 2008
Adam Brewster
[PATCH] git-rev-list: tolerate multiple --stdin options
There's no reason to fail if the user asks for --stdin twice. Of course there's only one stdin, and it can only be read once, and there's no reason to ask for it twice, but --all --all doesn't make sense, and that's accepted, so accept this too. Also, with read_revisions_from_stdin in revision.c where it might be called by other programs, it's better to check that stdin isn't at eof before trying to read it. Signed-off-by: Adam Brewster <asb@bu.edu> --- builtin-rev-list.c | 3 --- r...
Jul 6, 10:28 am 2008
Adam Brewster
[PATCH] Teach git-bundle to read revision arguments from std...
This patch allows the caller to feed the revision parameters to git-bundle from its standard input. This way, a script do not have to worry about limitation of the length of command line. Documentation/git-bundle.txt says that git-bundle takes arguments acceptable to git-rev-list. Obviously some arguments that git-rev-list handles don't make sense for git-bundle (e.g. --bisect) but --stdin is pretty reasonable. Signed-off-by: Adam Brewster <asb@bu.edu> --- bundle.c | 10 ++++++++-- ...
Jul 6, 10:28 am 2008
Junio C Hamano
Re: [PATCH] Move read_revisions_from_stdin from builtin-rev-...
At the mechanical level, yes you _can_, but it is simply a bad taste to do so. More library-ish files such as revision.c are better home for utility functions to be shared between builtins and commands. --
Jul 5, 8:57 pm 2008
Junio C Hamano
Re: [PATCH/RFC] Fix some warnings (on cygwin) to allow -Werror
Ah, I missed that. So it is not just warning squelch but is a bugfix in case unsigned and uint32_t are of different sizes. --
Jul 5, 8:57 pm 2008
Dmitry Potapov
Re: remote does not support deleting refs
What version of Git do you use on the server? I think Git before v1.5 does not support deleting remote refs. You have to upgrade Git on your server. Dmitry --
Jul 6, 9:29 am 2008
Martin
error: unlink(.git/refs/remotes/origin/testbranch) failed: w...
Hi, it seems that an old verison on the remote site was the problem: On debian/etch git seems to be too old. I upgraded git to the testing version and now I can delete remote branches. But I get another error: $ git push origin :testbranch To ssh://myserver.com/my/path/to/repository - [deleted] testbranch error: unlink(.git/refs/remotes/origin/testbranch) failed: No such file or directory error: Failed to delete Any idea? Thanks, Martin --
Jul 5, 8:20 pm 2008
Dmitry Potapov
Re: error: unlink(.git/refs/remotes/origin/testbranch) faile...
Hi, [please do not top post] It is harmless. It is just that "git push origin :refs/heads/testbranch" cannot remove your local reference to that branch because you already have removed it by running "git branch -d -r origin/testbranch" Normally you just run "git push origin :refs/heads/testbranch" without "git branch -d -r origin/testbranch" and then you will not have this error. Dmitry --
Jul 6, 2:34 pm 2008
previous daytodaynext day
July 5, 2008July 6, 2008July 7, 2008
speck-geostationary