[git-users] Re: prune during fetch, can I make it default for a remote?

2013-08-21 Thread Thomas Ferris Nicolaisen
On Thursday, August 15, 2013 12:29:10 AM UTC+2, Sam Roberts wrote:

 I don't see anything in the docs (other than a gui.pruneduringfetch). 
 I'd be OK with a global default, I think I want this always, but a 
 per/remote option for .git/config would be nice to. 

 Have I missed this somewhere? 


I usually prune as part of cleaning up old unused branches. I believe each 
of these cleanup utilities include automatic pruning:

   - *git-cleanup* (ruby gem): https://github.com/mloughran/git-cleanup
   - *git-sweep* (python/pip script): https://github.com/arc90/git-sweep
   - *git branch-blame* (shellscript): 
   https://gist.github.com/Espenhh/3804251#file-branch-blame-sh 
   
CAUTION: Make backups before trying out the above scripts. I'm not the 
author, nor have I tested them to any lengthy degree. 

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


[git-users] Re: Missing libcurl-4 win7 x64

2013-08-21 Thread Thomas Ferris Nicolaisen
On Tuesday, August 20, 2013 3:14:52 PM UTC+2, friesen...@gmail.com wrote:

 The latest windows install (1.8.3.msysgit.0) gives me an error about 
 libcurl-4.dll missing any time I try to push to a local git server(omv). 
  Copying and renaming libcurl.dll to libcurl-4.dll seems to fix the 
 problem, although I have some reservations about this.  

 Even at this, using the git gui gives me an error, it only works using the 
 command line, although this could be a separate issue.

 I would like to submit this is as a bug, but don't want to subscribe to 
 the main mailing list.


Please report this to msys...@googlegroups.com

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


[git-users] Re: How to subtree split the parent project without the added subprojects?

2013-08-21 Thread Thomas Ferris Nicolaisen
On Thursday, August 8, 2013 11:06:56 AM UTC+2, Gabriel wrote:

 Hi all,

 I am trying to use subtree instead of submodules to manage a project,
 but I don't know how to send the parent project alone. Let me explain my 
 self.

 We have a project split in a parent repository and some plug-in 
 repositories.
 One can use the parent project alone or adding plugins with 
 git subtree add --prefix=plugin-a 
 https://github.com/my-project/plugin-a.git master

 After the development is ready, one can split and commit the changes in 
 the plugin
 but I don't know how to commit the parent project without plugins.

 Any idea on how to do it?


I haven't tried this strategy myself, but I did come across this 
nice-looking article that may offer some help: 
http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/ 

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


[git-users] Re: gitweb, How to script alias to a directory? for cloning over http

2013-08-21 Thread Thomas Ferris Nicolaisen
On Thursday, August 8, 2013 1:06:58 AM UTC+2, Tyrone Lucero wrote:

 Hello, I need some guide that can  explain me the following:

 I wish to know the correct rule to make work cloning over http with my 
 configuration, without taking all the web server to server only as github

 I setup  gitweb to it can show in a directory
 by example, localhost/gitweb or 192.168.1.20/gitweb ; and works fine, 
 including rewrite rule

 Config file under conf.d from apache config files:

 Alias /gitweb /usr/share/gitweb

 SetEnv GITWEB_CONFIG /etc/gitweb.conf
 SetEnv GIT_PROJECT_ROOT /var/git
 SetEnv GIT_HTTP_EXPORT_ALL

 Directory /usr/share/gitweb
   Options ExecCGI FollowSymLinks Indexes
   AddHandler cgi-script .cgi
   Allow from all
   Order allow,deny
   DirectoryIndex index.cgi
   # Pretty gitweb URLs need rewrite engine on an enabled
   RewriteEngine on
   # rule condition indicates get filenames
   RewriteCond %{REQUEST_FILENAME} !-f
   # rule condition indicates get listing directories
   RewriteCond %{REQUEST_FILENAME} !-d
   # rule condition to show pretty short urls
   RewriteRule ^.* /gitweb/gitweb.cgi/$0 [L,PT]
 /Directory



Try following this guide for setting it up and let us know how that works 
out: 
http://www.tikalk.com/alm/setup-git-gitweb-git-http-backend-smart-http-ubuntu-1204
 

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


[git-users] Re: changed closed error while doing git push

2013-08-21 Thread Thomas Ferris Nicolaisen
On Wednesday, August 7, 2013 7:42:54 PM UTC+2, python.b...@gmail.com wrote:

 I am trying to push some changes to a git project and had to amend some 
 changes to my local commits, so rebased onto a MERGED change 400918 
 (otherwise it wouldn’t allow me to set the edit option, not sure if there 
 is any other way) ,made by changes and now when I try push I am running 
 into following error,I even tried to rebase on my changes,its still not 
 working,any inputs here?

 user{90} git push ssh://company.com:29418/project HEAD:refs/for/branch   
  
 Counting objects: 43020, done.Delta compression using up to 32 
 threads.Compressing objects: 100% (4374/4374), done.Writing objects: 100% 
 (5359/5359), 6.22 MiB | 8.17 MiB/s, done.Total 5359 (delta 1534), reused 2435 
 (delta 863)
 remote: Resolving deltas: 100% (1534/1534)
 remote: Processing changes: refs: 1, doneTo 
 ssh://company.com:29418/project 
 http://review-android.quicinc.com:29418/kernel/msm! [remote rejected] HEAD 
 - refs/for/branch (change 400918 closed)



This looks a bit like you are pushing to Gerrit or something. Is that the 
case? If so, please ask on the Gerrit mailing list: 
https://groups.google.com/forum/#!forum/repo-discuss 

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


[git-users] Re: Question about the cherry-picked commits.

2013-08-21 Thread mayur nagekar
Good you found it out with git cherry. Just to add git cherry would just 
show you the commid ids (sha). Try this for a more verbose output.

Omit those commits from  master which are in staging(even the ones which 
have been cherry-picked) or are patch-equivalent to a commit in staging

git log staging...master --cherry-pick --right-only --no-merges
On Wednesday, June 5, 2013 6:09:40 AM UTC+5:30, seonguk.baek wrote:

 Hi guys.

 I want to know the number of cherry-picked commits and commit lists.

 Example

 1 - 2 - *3* - *4* - 5  [master]
   \ 
6 - *7* - *8* - 9  [topic]

 7, 8 commits are cherry-picked from 3, 4 commits of master.

 How can I know cherry-picked commit lists in topic branch by using git log 
 or anything?

 Thank you.


-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


Re: [git-users] Strange effect when tar-ing a cloned repository

2013-08-21 Thread peter
Hi Dale,

Well, I've been reading the articles you advised. And I've done some 
extensive testing with various situations. But till now, all without the 
result I would like.
My files turned out not to be 'contaminated' with large holes, so every 
experiment with 'sparse options' (while copying, tar-ing  git-checkout) 
yielded the same result.

But just now I found out one curious thing ! After a series of trials, 
isolating (if possible) the files that are the cause of the problem I found 
one difference between these files and the rest in the filesystem.

The files that I suspect are all compiled without stripping (debug symbols 
present in the file). When I delete all these files the size of my tar-bal 
from the original filesystem is nearly the same as the one made from the 
git checkout.

So, the quest continues ..

Regards,

Peter


 Here's one explanation: 
 http://en.wikipedia.org/wiki/Sparse_files#Sparse_files_in_Unix 

 Also, read the du and cp manual pages, looking for the words 
 holes and sparse, to see situations where this matters. 

 Dale 


-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


Re: [git-users] How to diagnose a failing test

2013-08-21 Thread Dale R. Worley
To document the answer:

 From: Philip Oakley philipoak...@iee.org
 
  From: Dale R. Worley wor...@alum.mit.edu
  I've made a small change to the Git source and now test
  t/t1001-read-tree-m-2way.sh fails.  In particular, this test fails:
  [...]
  How do I get detailed information on exactly what the failure is?
 
 I presume you've read \git\t\README which has a lot of stuff about 
 testing.
 
 My limited attempts simply used various echo commands liberally 
 interspersed with the code. (plus close reading of the code - a 
 technique from history ;-)

Indeed, the file t/README contains a great deal of information about
executing the tests.  (The prove harness that is discussed is
present in the Git sources, and the sample commands that involve
prove can be executed in the test directory.)

You can execute each test individually within the test directory via
   sh ./t1234...
and get more information by adding the documented options:
   sh ./t1234... --verbose --debug --immediate

Dale

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.