headers
Paul Gortmaker | 8 Oct 04:08

[PATCH] guilt: add git commit level versioning

Shamelessly steal the dynamic versioning goodies from git
itself.  Now when you do "guilt --version" you can expect to
see things like:

	Guilt version 0.31.2.14.gece1.dirty

assuming you've 14 commits since 0.31.2 and also some changes
that you've not committed yet.

Signed-off-by: Paul Gortmaker <paul.gortmaker <at> windriver.com>
---
 .gitignore             |    2 ++
 Documentation/Makefile |    4 ++--
 GUILT-VERSION-GEN      |   42 ++++++++++++++++++++++++++++++++++++++++++
 Makefile               |   21 ++++++++++++++++-----
 guilt                  |    4 +++-
 5 files changed, 65 insertions(+), 8 deletions(-)
 create mode 100755 GUILT-VERSION-GEN

diff --git a/.gitignore b/.gitignore
index c81112b..61161ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
 #
 *~
 *.swp
+guilt.bin
+GUILT-VERSION-FILE
diff --git a/Documentation/Makefile b/Documentation/Makefile
(Continue reading)

Permalink | Reply | 0 comments |
headers
Jonathan del Strother | 8 Oct 01:08

[PATCH/RFC] Add post-init hook

This adds a configuration variable 'init.post-init-file', to supply a path to a script that will be run
following git-init (and thus also git-clone).

Signed-off-by: Jonathan del Strother <jon.delStrother <at> bestbefore.tv>
---

I have a number of hooks that I have to install every time I create/clone a repository.  This patch adds a
post-init hook that's perfect for setting up that sort of stuff.
It's my first git patch that does much C work (even if it was mostly a cut & paste job) - comments would be welcome.

 Documentation/config.txt   |    4 ++++
 Documentation/git-init.txt |    7 +++++++
 builtin-init-db.c          |   36 ++++++++++++++++++++++++++++++++++--
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index bbe38cc..746d663 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -881,6 +881,10 @@ i18n.logOutputEncoding::
 	Character encoding the commit messages are converted to when
 	running 'git-log' and friends.

+init.post-init-file::
+	A path to a script to run on the initialization of any git
+	repository.
+
 instaweb.browser::
 	Specify the program that will be used to browse your working
 	repository in gitweb. See linkgit:git-instaweb[1].
(Continue reading)

Permalink | Reply | 1 comment |
headers
Robin Rosenberg | 7 Oct 23:56

[Gitk PATCH 0/6] Menu accelerators for Gitk

I finally got tired of pressing Alt and some letter to activate menus in Gitk. 
For example in "any" program you can press Alt-F to have the File menu drop 
down and then select the underscored character to select the wanted menu.

This series makes it possible. Friends of TCL may think my solution is too
hack-ish. It doesn't fix all warts but that is the subject of later patches
as it looks like it requires other patches.

Git gui has the same problem, but again, subject to another series.

-- robin
Permalink | Reply | 6 comments |
headers
astubbs | 7 Oct 23:22

git-svn reuses https connections? connection drops


I have a many many file commit that i'm trying to dcommit.
It runs, for about 2 minutes, and then the server just suddenly stops
responding.

looking at the traffic with ethereal, it seems that there is *a lot* of tls
handshaking going on.
perhaps the server's security is dropping the connections for 10 seconds or
something because there are too many connection requests?

Does git-svn actually re-use the connection? It doesn't appear to. Unfort
i'm not up to scratch so I haven't been able to figure that out for myself.

this is what i get:
astubbs <at> ASTUBBS-PC /c/workspaces/gizmo2/gizmo
$ git svn dcommit --rmdir
Committing to https://cccc.xxxx.sss.com/svn/sdfsdfsdf/smurfs/trunk ...
Authentication realm: <https://svn.xxxssad.com:443> Subversion repository
Password for 'sdfsfd':
RA layer request failed: PROPFIND request failed on
'/svn/sdfsdf/sdfsdf/trunk/core/wicket-1.3.4-portal-2.0/jdk-1.4/wicket/src/main/java
/org/apache/wicket/util/parse/metapattern': PROPFIND of
'/svn/sdfsdfsdf/sdfsdf/trunk/core/wicket-1.3.4-portal-2.0/jdk-1.4/wicket/src/main/
java/org/apache/wicket/util/parse/metapattern': could not connect to server
(https://svn.sc.componence.com) at C:/msysgit/bin/git-svn line 3
385

this happens every time, but not at exactly the same file every time.

the commit contains upwards of 2,000 file adds.
(Continue reading)

Permalink | Reply | 0 comments |
headers
Rhodes, Kate | 7 Oct 23:00

git-who

Once upon a someone asked about seeing who had touched some files.  
Petr Baudis responded with a quickie script that did the job. I've  
since expanded upon it a little, and since I find it pretty useful, I  
figured I'd send it back for others to use too.

As is it's probably not worth including in git, but I'm thinking that  
someone else can probably come up with some improvements, such as  
dates in the verbose mode, support for a treeish instead of a single  
file path, and / or rewriting it in C so that it can work on Windows.

http://github.com/masukomi/git_accessories/tree/master
git://github.com/masukomi/git_accessories.git

Not that it's particularly worthy of it's own repo at the moment, but  
I figure I'll continue to keep poking it from time to time...

-masukomi
Permalink | Reply | 3 comments |
headers
Mikael Magnusson | 7 Oct 20:14

[PATCH] Fix a few typos in relnotes

---
  Documentation/RelNotes-1.6.0.3.txt |    8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/RelNotes-1.6.0.3.txt b/Documentation/RelNotes-1.6.0.3.txt
index edd5e45..6cf8ae4 100644
--- a/Documentation/RelNotes-1.6.0.3.txt
+++ b/Documentation/RelNotes-1.6.0.3.txt
@@ -53,7 +53,7 @@ Fixes since v1.6.0.2
  * Stale temporary files under $GIT_DIR/objects/pack are now cleaned up
    automatically by "git prune".

-* "git merge" once agrain removes directories after the last file has
+* "git merge" once again removes directories after the last file has
    been removed from it during the merge.

  * "git blame -C -C" no longer segfaults while trying to pass blame if
@@ -68,10 +68,10 @@ Fixes since v1.6.0.2
  * The "git commit" error message when there are still unmerged
    files present was clarified to match "git write-tree".

-* Some segfaults due to uncaught NULL pointers were fixed multiple
+* Some segfaults due to uncaught NULL pointers were fixed in multiple
    tools such as apply, reset, update-index.

-* Solaris bulds now default to OLD_ICONV=1 to avoid compile warnings.
+* Solaris builds now default to OLD_ICONV=1 to avoid compile warnings.

  * "Git.pm" tests relied on unnecessarily more recent version of Perl.
(Continue reading)

Permalink | Reply | 1 comment |
headers
Johannes Schindelin | 7 Oct 18:06

[PATCH] git rm: refresh index before up-to-date check


Since "git rm" is supposed to be porcelain, we should convince it to
be user friendly by refreshing the index itself.

Signed-off-by: Johannes Schindelin <johannes.schindelin <at> gmx.de>
---
 builtin-rm.c  |    1 +
 t/t3600-rm.sh |   25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/builtin-rm.c b/builtin-rm.c
index 50ae6d5..e06640c 100644
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -137,6 +137,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)

 	if (read_cache() < 0)
 		die("index file corrupt");
+	refresh_cache(REFRESH_QUIET);

 	pathspec = get_pathspec(prefix, argv);
 	seen = NULL;
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 558c80e..66aca99 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -219,14 +219,23 @@ test_expect_success 'Remove nonexistent file returns nonzero exit status' '

 test_expect_success 'Call "rm" from outside the work tree' '
 	mkdir repo &&
(Continue reading)

Permalink | Reply | 0 comments |
headers
David Bryson | 7 Oct 17:45

proper flags for make check ?


After the recent discussion about make check I decided to give it a try
and see what happens.

I installed sparse, took a look at the source and it appears to want
something along the following lines for a intel processor:

-D__LITTLE_ENDIAN__ -D__i386__=1

I then type 'make check' and get about 30 seconds of errors printing out
for kerberos headers.

The errors look a lot like this:

/usr/include/krb5/krb5.h:1166:18: error: got *
/usr/include/krb5/krb5.h:1167:18: error: Expected ; at end of
declaration
/usr/include/krb5/krb5.h:1167:18: error: got *
/usr/include/krb5/krb5.h:1168:20: error: Expected ; at end of
declaration
/usr/include/krb5/krb5.h:1168:20: error: got *
/usr/include/krb5/krb5.h:1169:1: error: Expected ; end of type
declaration
/usr/include/krb5/krb5.h:1169:1: error: got }
/usr/include/krb5/krb5.h:1173:17: error: expected ; at end of
declaration
/usr/include/krb5/krb5.h:1173:17: error: Expected } at end of
struct-union-enum-specifier

What is the proper way to run sparse on the git sources ?
(Continue reading)

Permalink | Reply | 0 comments |
headers
Johannes Sixt | 7 Oct 16:24

[PATCH] git-push.txt: Describe --repo option in more detail

From: Johannes Sixt <johannes.sixt <at> telecom.at>

The --repo option was described in a way that the reader would have to
assume that it is the same as the <repository> parameter. But it actually
servers a purpose, which is now written down.

Furthermore, the --mirror option was missing from the synopsis.

Signed-off-by: Johannes Sixt <johannes.sixt <at> telecom.at>
---
 I do not have the toolchain to format the documentation, so please take
 this with a grain of salt.

 -- Hannes

 Documentation/git-push.txt |   24 +++++++++++++++++++-----
 builtin-push.c             |    2 +-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 45c9643..6150b1b 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -9,8 +9,8 @@ git-push - Update remote refs along with associated objects
 SYNOPSIS
 --------
 [verse]
-'git push' [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>]
-	   [--repo=all] [-f | --force] [-v | --verbose]
+'git push' [--all | --mirror] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>]
(Continue reading)

Permalink | Reply | 0 comments |
headers
J.R. Mauro | 7 Oct 15:41

Git pager woes

Git doesn't set special options to it's pager command if the LESS
environment variable is set. I noticed when I started using Gentoo
that git was putting all output into a pager even if it were less than
one page, which it didn't do under Ubuntu. A fellow Gentoo user
confirms this; apparently Gentoo's defaults set LESS, but without a
-F.

Should git always tack on a -F when it invokes less, or should this be
put on the user to look up what to do? Or should I go complain to the
Gentoo folks?
Permalink | Reply | 3 comments |
headers
Knut Eldhuset | 7 Oct 12:54

Different svn-id URLs in history

Hi,

After cloning my svn repository, I notice that the svn-id URL is 
different when going back in history:

git-svn-id: https://server/trunk <at> 300

vs

git-svn-id: https://server/trunk/some_folder/project/src <at> 250

If i checkout the first version, I get a working copy that has the 
folder "some_folder" in it. If I checkout the latter version, I get a 
working copy with the contents of the folder "src". Why is this? I 
thought I always was supposed to get a wc with the whole tree.

Regards,
Knut Eldhuset
Permalink | Reply | 1 comment |

Gmane