[git-users] any suggestions for pruning all upstream branches after a github fork?

2014-09-29 Thread Sam Roberts
Basically, I'd like to delete every branch in my fork of an upstream
repo that is the same as an upstream branch.

With sufficient scripting, I can write something to enumerate and
compare branch heads, but I'm hoping someone knows of a tool that does
this, or can point me to some useful git plumbing to help.

github, for reasons lost to me, gives you a snapshot of all upstream
branches at time of fork, but not any new branches created upstream,
nor does it ever delete them when upstream deletes, or give any way to
synchronize... not to complain. :-)

Cheers,
Sam

-- 
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/d/optout.


Re: [git-users] git rev-list --objects doesn't show moves

2014-09-29 Thread Dale R. Worley
> From: Roman Neuhauser 
> 
> i'm writing an alternative to git-requet-pull.  its output includes
> a log of the commit range, eg:
> 
>   1/3 76a23b86 043603cc README fancier
>   162441d0 README
>   2/3 87990615 ab984c9b ignore vim swapfiles
>   32682119 .gitignore
>   3/3 2c842d2d 2ab371a4 README is now README.txt
> 
> each commit is represented by a line giving its position in the range,
> the treeid, the commitid and the subject line, followed by a series of
> lines identifying affected files, each line with the objectid and path.
> 
> i'm gathering the data with `git-rev-list --objects`, but it doesn't
> mention objects that were moved (git mv) in a given commit; this is
> visible in the last (3/3) commit in the example above: that commit was
> just `git mv README README.txt`.
> 
> i want the output to identify moves and copies.  what are my options?
> am i missing an option in git-rev-list(1)?  should i use a different
> piece of plumbing?

The fundamental problem is that Git's data structures don't list moves
and copies.  For that matter, they don't list adds and deletes,
either.  As stored, each commit just tells the contents of the
directory tree.  What you appear to want is something that compares
one or more commits and tells what the differences between them are.

OTOH, is that what you *really* want?  You say that you're "writing an
alternative to git-request-pull".  What is the definition of this
output?  What purposes do you expect the output to be put to?

For instance, when you're pulling commit 3/3 from the remote, you
don't *need* to download the blob that is the current contents of
README.txt (and the former contents of README) because you already
have it in your repository.  So "git-rev-list --objects" doesn't list
it.

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/d/optout.


Re: [git-users] Can't clean "untracked changes."

2014-09-29 Thread Konstantin Khomoutov
On Sun, 28 Sep 2014 03:18:17 -0700 (PDT)
Chris Carter  wrote:

> Windows 8.1 64-bit
> git version 1.9.4.msysgit.0
> 
> I think I found a bug, but want to make sure before I actually say so.
> 
> Background: I've been trying to compile Qt, and after doing so
> decided I wanted to do it differently. The steps for this process
> involve fetching the various Qt modules with git and then calling
> `perl init-repository`, which changes the contents of the repo. (I'm
> not certain it actually changes any files, but it definitely adds
> several.)
> 
> `git status` showed lines resembling this:
> modified:(untracked content)

Looks like you're merely looking at a submodule [1] -- see [2]
for more info.

If so, there's nothing to be aware of: if you really like to, add
this directory to the ".git/exclude" file.

You might want to try running

  git submodule status

and/or

  git submodule summary

to get the idea if your repository is really using submodules.

1. http://git-scm.com/book/en/Git-Tools-Submodules
2. http://stackoverflow.com/q/5126765/720999

-- 
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/d/optout.


Re: [git-users] Git on WD My Cloud Drive

2014-09-29 Thread Dale R. Worley
> From: Kevin Brooks 
> 
> Has anyone set up a Git repository on a WD My Cloud Drive?  If so I could 
> use some help.

It would be more efficient if you told us what wasn't working as
expected.

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/d/optout.


Re: [git-users] Can't clean "untracked changes."

2014-09-29 Thread Dale R. Worley
> From: Chris Carter 
> 
> `git status` showed lines resembling this:
> modified:(untracked content)
> 
> I found that these commands refused to properly restore me to a "pristine" 
> state, matching my remote:

I'm no expert, but I'd say it's a design decision:  If Git isn't
supposed to track xyzzy, then it also shouldn't delete it.

The usual way of getting untracked stuff into your working directory
is by compiling things, and the usual way of getting rid of it is
"make clean" or "make distclean".

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/d/optout.


[git-users] Git svn missing merge history after git fetch

2014-09-29 Thread Pavel Kukushkin
Hello!

I have a huge svn repo (about 3 GB checked out branch). So complete 
git-svn's clone is not an option in my case.
I've decided to checkout by branch in case I need that branch.
Here is my .git/config at start

[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true

[svn-remote "svn"]
url = svn://repo.host/repo.path
fetch = branches/branch1:refs/remotes/git-svn-branch1

Then I've added one more branch like this:
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true

[svn-remote "svn"]
url = svn://repo.host/repo.path
fetch = branches/branch1:refs/remotes/git-svn-branch1
fetch = branches/branch2:refs/remotes/git-svn-branch2

During git svn fetch I noticed many messages that looks like this

> Couldn't find revmap for branch svn://repo.host/repo.path/branches/branch1
>

After that new branch has checked out with no merge history with  branch1.

Is there some way to fix merge history?

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/d/optout.


[git-users] Can't clean "untracked changes."

2014-09-29 Thread Chris Carter
Windows 8.1 64-bit
git version 1.9.4.msysgit.0

I think I found a bug, but want to make sure before I actually say so.

Background: I've been trying to compile Qt, and after doing so decided I 
wanted to do it differently. The steps for this process involve fetching 
the various Qt modules with git and then calling `perl init-repository`, 
which changes the contents of the repo. (I'm not certain it actually 
changes any files, but it definitely adds several.)

`git status` showed lines resembling this:
modified:(untracked content)

I found that these commands refused to properly restore me to a "pristine" 
state, matching my remote:
git checkout -- .
git checkout HEAD
git reset --hard
git clean -xdf

I also tried several variations on the above, but they didn't help and the 
listed versions seem to be recommended.

TortoiseGit (1.8.11.0-64bit) reported a similar status, but was similarly 
ineffective at cleaning it up.

-- 
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/d/optout.


[git-users] First parent traverse problem and git rev-list --first-parent --ancestry (wrong?) behaviour

2014-09-29 Thread Vasily Makarov
Hi there!

I've been looking for a method to check whether one commit is reachable 
from another via first-parent traverse (without traversing tree manually) 
and I've stumbled into strange git rev-parse behavior.

Imagine following git tree:
--A---B---C--
\ /
 D---E
In this tree commit B is the first parent of C.

1. How do I check whether B or E are reachable from C by first parent?
*git rev-list --first-parent B..C *and *git rev-list --first-parent E..C* 
both return SHA of C

2. The issue I'm reporting is that *git rev-list --first-parent 
--ancestry-path* seems to behave wrong:
*git rev-list --first-parent --ancestry-path E..C* returns SHA of C, while 
(according to *man git rev-parse)* "--ancestry-path" should restrict 
command output to commits being both descendants of E and ancestors of C.
*git rev-list --first-parent --ancestry-path E^..C* returns zero commits 
which is correct.

-- 
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/d/optout.


[git-users] Git on WD My Cloud Drive

2014-09-29 Thread Kevin Brooks
Has anyone set up a Git repository on a WD My Cloud Drive?  If so I could 
use some help.

-- 
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/d/optout.


Re: [git-users] git grep find files containaing A AND NOT B (in all lines)

2014-09-29 Thread Magnus Therning
On Thu, Sep 25, 2014 at 5:09 PM, iv  wrote:
> git grep -l --all-match -e A --and --not -e B
>
> gives me files containing A and containing B or not
> ...

As I said, it works here.  If you put together a minimal example repo
and either share it somewhere, or bundle it and share the bundle, then
send an email with the exact command line (I'm guessing 'A' and 'B'
above aren't what you're actually searching for).  Do that, and we
might be able to help you further.

/M

-- 
Magnus Therning  OpenPGP: 0xAB4DFBA4
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe   http://therning.org/magnus

-- 
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/d/optout.