| Sverre Rabbelier | .gitignore polution
Heya,
I usually compile git from next (sometimes pu to test out a new
feature), and when I then switch back to a development branch (usually
based off master) I get something like this:
$ git status
# On branch remote-helpers
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# git-http-backend
# git-notes
# git-remote-hg
# test-index-version
Now I can easily do 'git clean -f', but it's somewhat annoying. How do
other developers deal with ...
| Nov 14, 4:57 pm 2009 |
| =?iso-8859-1?Q?Bj=F6 ... | pre-built man pages have ".ft" noise
Hi Junio,
since 916a3c4b7 "Autogenerated manpages for v1.6.5.1-69-g36942", some of
the man pages in the "man" branch have a lot of the ".ft C" and ".ft"
noise. Apparently, you upgrade some parts of your system, as the changes
that introduced the noise also show:
-.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
And that new version seems to somehow end up producing:
-\.ft C
+\&.ft ...
| Nov 14, 4:47 pm 2009 |
| Lorenzo Bettini | pushing remote branches
Hi
I recently started to use git, and I experienced problems with branches:
on my machine I did (on an already cloned repo)
git checkout -b experiments origin/experiments
and thus my config reads
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git://...
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "experiments"]
remote = origin
merge = refs/heads/experiments
isn't this enough to be ...
| Nov 14, 4:37 pm 2009 |
| Tarmigan Casebolt |
| Nov 14, 2:33 pm 2009 |
| Tarmigan Casebolt | [PATCH 1/2] http-backend: Fix access beyond end of string.
Found with valgrind while looking for Content-Length corruption in
smart http.
Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com>
---
http-backend.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/http-backend.c b/http-backend.c
index f8ea9d7..ab9433d 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -634,7 +634,7 @@ int main(int argc, char **argv)
cmd = c;
cmd_arg = xmalloc(n);
strncpy(cmd_arg, dir + out[0].rm_so + 1, n);
- cmd_arg[n] = ...
| Nov 14, 2:10 pm 2009 |
| Tarmigan Casebolt | [PATCH 2/2] http-backend: Let gcc check the format of mo ...
We already have these checks in many printf-type functions that have
prototypes which are in header files. Add these same checks to
static functions in http-backend.c
Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com>
---
Shawn, please consider this patch in addition to the one that you posted
that actually fixes the bug. With this patch, gcc will warn about that bug.
http-backend.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/http-backend.c ...
| Nov 14, 2:10 pm 2009 |
| Pat Thoyts | [gitk] [PATCH] Fix selection of tags.
When a tag is clicked an error is raised due to a missing parameter in
a function call.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
gitk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gitk b/gitk
index 4e2be7f..364c7a8 100755
--- a/gitk
+++ b/gitk
@@ -10489,7 +10489,7 @@ proc showtag {tag isnew} {
set text "[mc "Tag"]: $tag\n[mc "Id"]: $tagids($tag)"
}
appendwithlinks $text {}
- maybe_scroll_ctext
+ maybe_scroll_ctext ...
| Nov 14, 6:21 am 2009 |
| Francis Moreau | Question about "git pull --rebase"
hello,
Let's say I'm on a branch called 'foo'.
I tried to rebase this branch by using 'git pull --rebase'.
I first tried the following command:
$ git pull --rebase origin master:foo
remote: Counting objects: 5, done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From /dev/shm/git/A
! [rejected] master -> foo (non fast forward)
which failed.
Then I tried:
$ git pull --rebase origin master
which ...
| Nov 14, 1:39 pm 2009 |
| Nanako Shiraishi | Re: Question about "git pull --rebase"
With this command line, you are asking:
1) Please first fetch master from origin and update the local
'foo' with it, but please fail if this doesn't fast forward;
2) If the first step was successful, please rebase the current
branch on top of that commit.
If your current branch 'foo' doesn't fast forward, the first step
should fail, and that is the failure you saw.
Your request doesn't make any sense. The first step would succeed
only when your 'foo' doesn't have anything ...
| Nov 14, 4:16 pm 2009 |
| Johan 't Hart | Re: Question about "git pull --rebase"
Francis Moreau schreef:
> hello,
>
> Let's say I'm on a branch called 'foo'.
>
> I tried to rebase this branch by using 'git pull --rebase'.
>
> I first tried the following command:
>
> $ git pull --rebase origin master:foo
> remote: Counting objects: 5, done.
> remote: Total 3 (delta 0), reused 0 (delta 0)
> Unpacking objects: 100% (3/3), done.
> From /dev/shm/git/A
> ! [rejected] master -> foo (non fast forward)
When using a refspec, ...
| Nov 14, 4:29 pm 2009 |
| Simon Strandgaard | git gc - out of memory
My bare repository is on an OpenBSD machine.
I was unaware of the importance of git gc until today
after investigating a problem with "git pull".
So there hasn't been run git gc on the repository ever.
The biggest file in the repository is a 45 mb file.
The repository size is near 2 gb.
What can I do?
$ git gc
Counting objects: 5934, done.
warning: suboptimal pack - out of memory
fatal: Out of memory, malloc failed8)
error: failed to run repack
$ git --version
git version 1.6.5.2
$ ...
| Nov 14, 12:26 pm 2009 |
| Matthew Ogilvie | [PATCH] cvsserver doc: database generally can not be rep ...
A regenerated git-cvsserver database is at risk of having different
CVS revision numbers from an incrementally updated database. Mention
this in the the documentation, and remove an erroneous statement
to the contrary.
Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
---
Documentation/git-cvsserver.txt | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index 785779e..99a7c14 ...
| Nov 14, 11:39 am 2009 |
| Matthew Ogilvie | [PATCH] Doc: mention the crlf attribute in config autocr ...
The reverse reference has long existed, and the autocrlf description
was actually obsolete and wrong (saying only file content is used),
not just incomplete.
Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
---
Documentation/config.txt | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index d1e2120..0dc6b12 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -169,9 +169,10 @@ ...
| Nov 14, 11:35 am 2009 |
| Victor Engmark | git svn fetch loses data
Hi all,
I've been trying to move from Subversion to Git for a couple days now,
and I can't get git svn to get all my data. The progress so far is
explained at <http://l0b0.wordpress.com/2009/11/14/n-way-git-synchronization-with-extra-cheese/>.
git svn fetch doesn't report any errors, and goes through the entire
repository as regular as anything, but at the end about half of the
root directories are missing. Even the file modified by the last
commit is not there at all. Any ideas why this ...
| Nov 14, 10:07 am 2009 |
| Sverre Rabbelier | Re: git svn fetch loses data
Heya,
Your working copy is probably not up to date anymore, try:
$ git rebase git-svn
--
Cheers,
Sverre Rabbelier
--
| Nov 14, 12:38 pm 2009 |
| Sverre Rabbelier | Re: git svn fetch loses data
Heya,
Can you be more specific, what is the layout of your repository and
which directories are missing?
/ -- trunk
-- branches
-- tags
-- thirdparty
-- private
If your repository looks like that, and 'thirdparty' and 'private' are
missing, that's because git svn assumes that you're only interested in
trunk, branches and tags by default.
--
Cheers,
Sverre Rabbelier
--
| Nov 14, 10:25 am 2009 |
| Victor Engmark | Re: git svn fetch loses data
I'm not entirely sure which directories you mean - I've got none of
those, neither in the repository nor the working copy. One of the
directories missing in the top-level directory of the working copy is
"Linux", which contains my .bashrc and tens of other config files.
Which is really odd, because here are the last few lines of "git svn
fetch --revision 993:1879":
r1878 = 3fcec05426b59b0bad43b02cc3c367525d2c0b93 (git-svn)
M Linux/etc/cups/printers.conf
r1879 = ...
| Nov 14, 12:29 pm 2009 |
| Victor Engmark |
| Nov 14, 1:35 pm 2009 |
| Johan 't Hart |
| Nov 14, 4:35 pm 2009 |
| webdesk | 1,000,000.00 Pounds
You are given 1,000,000.00 Pounds by the British Telecom Promo
Name:.............. Address:..........
Occupation:........ Phone Number:.....
--
| Nov 14, 3:43 am 2009 |
| Greg Price | [PATCH] rebase -i: Simplify handling of invalid commands.
A few weeks ago there was a bug report that some invalid commands
produced confusing error messages. The fix could have made things
simpler. There's no need for die_with_patch in this case, because its
purpose is to tell rerere and a future rebase --continue about a
commit that we just attempted, and we didn't attempt any commit. So
just use a plain "die" unconditionally.
Signed-off-by: Greg Price <price@mit.edu>
---
git-rebase--interactive.sh | 7 +------
1 files changed, 1 ...
| Nov 14, 1:11 am 2009 |
| Stephen Boyd | [PATCH 0/2] Migrate ls-tree to parse-opts
This looked pretty straightforward. I guess --name-status is there
for backward compatibility. Should it be there anymore?
Stephen Boyd (2):
t3101: test more ls-tree options
ls-tree: migrate to parse-options
builtin-ls-tree.c | 100 +++++++++++++++++--------------------------
t/t3101-ls-tree-dirname.sh | 89 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 127 insertions(+), 62 deletions(-)
--
| Nov 13, 9:34 pm 2009 |
| Stephen Boyd | [PATCH 2/2] ls-tree: migrate to parse-options
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
builtin-ls-tree.c | 100 +++++++++++++++++++++-------------------------------
1 files changed, 40 insertions(+), 60 deletions(-)
diff --git a/builtin-ls-tree.c b/builtin-ls-tree.c
index 22008df..04408df 100644
--- a/builtin-ls-tree.c
+++ b/builtin-ls-tree.c
@@ -9,6 +9,7 @@
#include "commit.h"
#include "quote.h"
#include "builtin.h"
+#include "parse-options.h"
static int line_termination = '\n';
#define LS_RECURSIVE 1
@@ ...
| Nov 13, 9:34 pm 2009 |
| Stephen Boyd | [PATCH 1/2] t3101: test more ls-tree options
Add tests for --full-name, --full-tree, --abbrev, and --name-only.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
t/t3101-ls-tree-dirname.sh | 89 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh
index 51cb4a3..99458e4 100755
--- a/t/t3101-ls-tree-dirname.sh
+++ b/t/t3101-ls-tree-dirname.sh
@@ -39,8 +39,8 @@ test_expect_success \
tree=`git write-tree` &&
...
| Nov 13, 9:34 pm 2009 |
| Stephen Boyd | [PATCH] git-add.txt: fix formatting of --patch section
Extra paragraphs should be prefixed with a plus sign.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
Documentation/git-add.txt | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 45ebf87..e93e606 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -76,10 +76,10 @@ OPTIONS
work tree and add them to the index. This gives the user a chance
to review the difference before ...
| Nov 13, 6:45 pm 2009 |
| Jens Kubieziel | Resolving a merge conflict with git-svn
Hi,
I recently came across a big conflict. Someone used Subversion and
made a complete wrong commit. I did a 'git svn rebase' at some point
and ran into the conflict. My goal at this point was to remove the
wrong commit, but I found no way how to do it (git-revert needs a
clean tree; git stash brought [fatal: git-write-tree: error building
trees,Cannot save the current state]). What way would suggest to
remove that wrong made commit and continue with the rebase?
Thanks for any hints.
--
| Nov 13, 5:30 pm 2009 |
| Daniele Segato | Re: Resolving a merge conflict with git-svn
I don't know if this could help but I tell you what I would do.
I would abort the conflicting rebase
"backing up" my branch by:
git checkout mybranch
git checkout -b mybranchBackup
then I would do a git reset --hard <last-committed-svn-commit>
at this point a:
git svn rebase
shouldn't give conflict since it should be a fast forward.
Then you should have two branch:
mybranch: which is SVN-up-to-date but has no one of your modification
mybranchBackup: which has an old SVN ...
| Nov 13, 5:58 pm 2009 |
| Andreas Gruenbacher | GNU patch: new 2.6 release
I am pleased to announce my first release of GNU patch,
available by anonymous FTP from:
ftp://ftp.gnu.org/gnu/patch/
The last release dates back to June 2004 with version 2.5.9. A new Savannah
project has been created with the new code repository and the bug-patch
mailing list archive at:
http://savannah.gnu.org/projects/patch
A lot of changes have accumulated since version 2.5.9. The following user
visible changes have been made:
* A regression test suite has been added ...
| Nov 13, 5:09 pm 2009 |
| =?UTF-8?Q?Bj=C3=B6rn ... | Re: GNU patch: new 2.6 release
Nice to see a new release.
Do you have any plans to support git-style binary patches?
That would be very useful in a workflow when you work in git (and have some
binary files in the repository), but need to commit your finished work
into another VCS (such as Clearcase).
/Björn
--
Björn Gustavsson, Erlang/OTP, Ericsson AB
--
| Nov 14, 1:45 am 2009 |
| Andreas Gruenbacher | Re: GNU patch: new 2.6 release
Support for git's extended header lines for renames, copies, hashes, file
modes would be great. I'll happily take patches or eventually implement it
myself. Binary patches are not as high on my wish list, but feel free to send
Isn't there a better way to do this than with patches?
Thanks,
Andreas
--
| Nov 14, 3:17 am 2009 |
| =?UTF-8?Q?Bj=C3=B6rn ... | Re: GNU patch: new 2.6 release
Support for the other extended header lines would be useful for me too.
I might have a go at implementing them (and binary patches) at some
If there is a better way, I would be very interested in finding out what it is.
Feeding the output from 'git format-patch' to patch is the
best way I've had come up with yet. patch (given the '-g 1' option)
will automatically check out the files that are to be patched.
I have wrapped that in a simple script that retrieves the commit
comment from the ...
| Nov 14, 5:27 am 2009 |
| Eric Wong | Re: [PATCH 1/2] git-svn: add (failing) test for SVN 1.5+ ...
Hi Toby,
Thanks for this series, acked and squashed into a single commit to avoid
unnecessary bisection failures at git://git.bogomips.org/git-svn
commit 753dc384dc2c4ab3e1049f695425cebf41ff7e6b
Author: Toby Allsopp <toby.allsopp@navman.co.nz>
Date: Sat Nov 14 13:26:47 2009 -0800
git svn: handle SVN merges from revisions past the tip of the branch
When recording the revisions that it has merged, SVN sets the top
revision to be the latest revision in the repository, ...
| Nov 14, 2:40 pm 2009 |
| Raman Gupta | Re: [PATCHv3] Add branch management for releases to gitw ...
Thanks for the explanation. Makes sense.
Ok, another dumb question: since you have now submitted a patch on top
of my patch, what is the proper etiquette for proceeding? Who
maintains this patch series until it is committed? Since your patch
applies on top of mine I can't really make any more changes without
affecting your patch right? I can't find any guidance in the
SubmittingPatches document.
Cheers,
Raman
--
| Nov 13, 10:35 pm 2009 |
| =?UTF-8?Q?Bj=C3=B6rn ... |
| Nov 14, 1:59 am 2009 |
| Nanako Shiraishi | Re: [PATCHv3] Add branch management for releases to gitw ...
What usually happens is that we wait now.
In this case we are in agreement that it is a good idea to apply
both of our patches (mine was only repeating what Junio said in
his comments), so if I were you, I would anticipate that Junio
would apply both of them and start preparing incremental updates
on top of them now, and send them when the patches appear in his
'pu' branch.
Junio has gone quiet for the past few days; maybe he is too busy
to read or respond to either of our patch. ...
| Nov 14, 2:01 am 2009 |
| Raman Gupta |
| Nov 14, 10:27 am 2009 |
| Jonathan Nieder | Re: [PATCH] Speed up bash completion loading
Sounds like a bug; thanks. I’ll squash in something like the following
for the next iteration.
-- %< --
Subject: completion: avoid computing command list twice
__git_all_commands is being computed twice on git <TAB><TAB> with
git help <TAB><TAB> after.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
contrib/completion/git-completion.bash | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/contrib/completion/git-completion.bash ...
| Nov 14, 3:35 am 2009 |
| Jonathan Nieder | Re: [PATCH] Speed up bash completion loading
Not good. I think the sanest thing to do is avoid caching the merge
strategy list entirely. Listing merge strategies takes about 100 ms
Right, if this happened to me I would not be too surprised. A similar
problem occurs when someone installs a new git subcommand in the
middle of a session. Starting a new session fixes the completion, but
should the completion script do something to help people before then?
It could provide a shell function with a slightly friendlier name ...
| Nov 14, 4:01 am 2009 |
| SZEDER =?iso-8859-1? ... | Re: [PATCH] Speed up bash completion loading
Hi,
Why? Don't get overly creative here, the command
. /path/to/git-completion.bash
already does that, plus it fixes the merge strategy completion issue,
and it's friendly enough for the users.
Best,
Gábor
--
| Nov 14, 7:43 am 2009 |
| Jonathan Nieder | Re: [PATCH] Speed up bash completion loading
Hi Gábor,
Sounds like a good approach. Squashing this in should get that
working again.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
In this patch, I assume the merge strategy list is not being cached
any more. Something like this would allow recovering from the merge
strategy completion issue, but the victim would have to notice what
went wrong first.
contrib/completion/git-completion.bash | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git ...
| Nov 14, 12:33 pm 2009 |
| Stephen Boyd | Re: [PATCH] Speed up bash completion loading
I was thinking of adding an option to git merge (like --strategies) to
list the strategies without requiring you to be in a git directory. It
doesn't look that easy at first glance so it might not be worth the
trouble.
--
| Nov 14, 4:46 pm 2009 |
| Eric Wong | [PATCH] git svn: read global+system config for clone+init
Hi Curt,
Thanks for the bug report, the following patch should fix
the bug. Also pullable from git://git.bogomips.org/git-svn
From 1a30582b43e137e16b3486d83bb86b0eb090e13d Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Sat, 14 Nov 2009 14:25:11 -0800
Subject: [PATCH] git svn: read global+system config for clone+init
Since $GIT_DIR does not exist when initializing new repositories,
we can follow back to the global and system config files for
git.
The logic for ...
| Nov 14, 3:39 pm 2009 |
| Eric Wong | Re: [PATCH] git svn: read global+system config for clone+init
It took me a while (possibly due to low caffeine levels) to make a
failing (automated) test case, but I've also pushed this out as
well.
From e2f8617b266e320fd58ab584cae2ebe9906daaac Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Sat, 14 Nov 2009 14:43:20 -0800
Subject: [PATCH] git svn: add authorsfile test case for ~/.gitconfig
The commit for:
git svn: read global+system config for clone+init
Initially lacked a test case because the author was unable ...
| Nov 14, 3:50 pm 2009 |
| Tarmigan | Re: [PATCH] http-backend: Fix bad treatment of uintmax_t ...
This fix is better than the (uintmax_t) cast that I was thinking about posting.
Please also consider the "__attribute__((format(printf,1,2))" patches
that I just posted to the list that would warn about this in the
future.
Thanks,
Tarmigan
--
| Nov 14, 2:49 pm 2009 |
| Paul Mackerras | Re: [gitk] [PATCH] 0/2 Merging master into dev
I don't think there is a way to send a merge commit by email. I think
you would have to put a repository somewhere with the merge in it and
invite me to pull it.
In any case, I have just merged the dev branch into the master branch
and then applied your second patch, and pushed out the result.
Paul.
--
| Nov 14, 4:20 am 2009 |
| Paul Mackerras |
| Nov 14, 4:14 am 2009 |
| Paul Mackerras |
| Nov 14, 4:14 am 2009 |
| Nanako Shiraishi |
| Nov 13, 7:12 pm 2009 |
| Paul Mackerras |
| Nov 14, 4:14 am 2009 |
