[git-users] Re: Can not install https://git-scm.com/download/win

[Marko Palola]

Looks like with 2.5.1 I had the same issue.

However, I can install 2.5.0.

BR
 Marko

lauantai 12. syyskuuta 2015 21.05.36 UTC+3 Marko Palola kirjoitti:

>
> 
> Hi
>
> Just tried to install git for windows
>
>
>- Git-2.5.2-32-bit (30 585 760 bytes) 
>
>
>- PortableGit-2.5.2-32-bit.7z  (28 138 856 bytes)
>
> My virusscanner (Bitfefender) removes git.exe and git-gui.exe during 
> installation claiming trojan infection.
>
>
> 
>
>
>
>
>
>
>
>

-- 
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] Rebase ... I am completely confused

[Philip Oakley]

From: "Michael" 


Alright.

The original problem: I have a repo forked from someone else's repo. I 
am taking over maintenance and possible enhancements.


That's two distinct tasks (maintenance vs enhancements). Be prepared for 
differing approaches for each.


Also how will folks know to change to your fork, rather than the 
original?


Personally, I'd suggest one 'maintainers' fork which is the canonical 
repo, and then have a personal repo for hacks.


Have a look at how git.git works. (look also for Junio Hamano's personal 
repo).




As part of this, and following good coding practice, I have made 
branches for the various things that I have been doing.


I have also made updates to master to bring that branch up to current 
release; the original was based against a library (Forge) at a much 
older version, and I needed to both update to the current version, and 
update the compilation environment so that it would work inside Eclipse 
properly.


Make sure you do just one thing at a time, i.e. do the minimum needed at 
each step, and keep the code 'working'. The update to eclipse can be 
stage 2. Tagging each major step allows very fine grained commits. It's 
too easy to hurry and put three steps in one commit!




Now, I want to make things put all together.

I found that if I just did a bunch of merges, I could get something 
that worked with minimal conflicts (two patches that applied to almost 
adjacent lines messed up one merge, and the same changes in a different 
line order messed up a second). It wasn't that hard -- but it left a 
very messy looking repo.


Do define what shape you desire and what are it's key features 
(maintainer hat). e.g. squash all changes, always fast forward, or 
always neat side loops of fine grained commits, topics start at the last 
tag, topics start no further back than the last tag, etc. The control 
has been distributed to YOU. You have control of the canonical repo. 
Others can do what they like with their forks & clones, but you get to 
choose what you'll accept back and how it should look (the benign 
helpful dictator approach;-).


If you are getting difficulties with divergence, then try using rebase 
(for the branches), so that each branch is based off your last tag, and 
is hopefully short, so the possibility of divergence/ conflict becomes 
smaller.


If you can make sure you have a test machine to ensure all commits 
compile cleanly, and pass tests, that way you can bisect discovered 
failures later. (another rule).


Git has a 'master branch', a 'next' branch of generally stable fixes, 
and 'pu' (potential updates) that has all the rest. i.e. quite limited 
as a public view.




I want to clean up my repo. That is the goal.

My understanding of best practices for something that you are 
publishing with git for others is to clean up your commits -- rewrite 
history as the normal behavior.


True



Based on that, I am trying to learn how to rewrite history, and to see 
what the repo looks like when re-written.


Also determine what are the base points in the history that you _will_ 
keep. They are your key start points for bringing in your updates. Then 
determine which parts (both merges and hack commits) need to be expunged 
(binned). This leaves you with a view of what you need to keep. And by 
now a view of where they are to go.




The 
https://bitbucket.org/keybounce/minecraft-finite-fluids/commits/all 
appears to give a reasonable display of the current flow if that 
helps you.


This is nice; I did not know about that. Thank you.
As I said, it looks messy.

My goal is to learn how to clean up git history.
My understanding based on what I have read/seen so far is that rebase 
is used for that.

My first attempt to understand rebase from the manual was a failure.


The rebase manual isn't the easiest to understand ! ! !
It's best to create a temporary repo to practice on. Try using the 
examples in the scm book as one option.


My second, based on what you said, did not work the way I understood it 
to work.


My apologies.


So right now, I would say that I don't really understand how git names 
the sequence of changes on a branch (from when it was split off to the 
head of that branch) (I thought it was just the name of the branch 
itself) (and I probably still don't understand 2 dot vs 3 dot vs no 
dot), nor how rebase actually works.


Dots: Have a look at 
http://stackoverflow.com/questions/7251477/what-are-the-differences-between-double-dot-and-triple-dot-in-git-dif, 
and the comment about it being different for 'diff' and 'log' (I learnt 
something there as well!)


see also 'git help revisions' - there are a number of Git guides that 
have man pages accessed via the normal help (try 'git help -g' - that's 
my one code contribution to Git so far ;-). and see also the 'git help 
git' page!


It's important to understand (i.e. it's hard to understand at first) 
that a branch is just a temporary name for a loose end of 

[git-users] Ran upgrade package, yet still says old version in terminal (MAC)

[Robert Marshall]

Hi all,

Running OSX Yosemite 10.10.5 on a Mac Mini. I checked and the currently 
installed version of Git comes up at 2.3.2 in the terminal prompt. I 
downloaded the latest build package, which is 2.5.0, released earlier this 
month.

At this point I opened the dmg file and ran the 
git-2.5.0-intel-universal-mavericks.pkg file, and followed the instructions 
to install the package. After receiving "The Software Package was 
Successfully Installed Message" I checked the version again. However, it is 
still showing 2.3.2 as being installed.

I even logged out, and back in. But, it's still showing the older version.

Is the installer not working properly, or am I missing a step somewhere 
along the lines?

Thanks!

Robert

-- 
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] Rebase ... I am completely confused

[Michael]

Alright.

The original problem: I have a repo forked from someone else's repo. I am 
taking over maintenance and possible enhancements.

As part of this, and following good coding practice, I have made branches for 
the various things that I have been doing.

I have also made updates to master to bring that branch up to current release; 
the original was based against a library (Forge) at a much older version, and I 
needed to both update to the current version, and update the compilation 
environment so that it would work inside Eclipse properly.

Now, I want to make things put all together. 

I found that if I just did a bunch of merges, I could get something that worked 
with minimal conflicts (two patches that applied to almost adjacent lines 
messed up one merge, and the same changes in a different line order messed up a 
second). It wasn't that hard -- but it left a very messy looking repo.

I want to clean up my repo. That is the goal.

My understanding of best practices for something that you are publishing with 
git for others is to clean up your commits -- rewrite history as the normal 
behavior.

Based on that, I am trying to learn how to rewrite history, and to see what the 
repo looks like when re-written.

> The https://bitbucket.org/keybounce/minecraft-finite-fluids/commits/all 
> appears to give a reasonable display of the current flow if that helps you.

This is nice; I did not know about that. Thank you. 
As I said, it looks messy.

My goal is to learn how to clean up git history.
My understanding based on what I have read/seen so far is that rebase is used 
for that.
My first attempt to understand rebase from the manual was a failure.
My second, based on what you said, did not work the way I understood it to work.

So right now, I would say that I don't really understand how git names the 
sequence of changes on a branch (from when it was split off to the head of that 
branch) (I thought it was just the name of the branch itself) (and I probably 
still don't understand 2 dot vs 3 dot vs no dot), nor how rebase actually works.

Additional information:
1. Most of the branches are short (1 or 2 commits).
2. My understanding of "cleaned up" includes squashing all branches down to a 
single commit when merged into master,
3. My understanding of cleaned up includes: When cleaned up, master should look 
like a bunch of fast forward, as non-fast forwards break other tools (such as 
bisect).

-- 
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 not install https://git-scm.com/download/win

[Marko Palola]

Hi

Just tried to install git for windows


   - Git-2.5.2-32-bit (30 585 760 bytes) 


   - PortableGit-2.5.2-32-bit.7z  (28 138 856 bytes)

My virusscanner (Bitfefender) removes git.exe and git-gui.exe during 
installation claiming trojan infection.









-- 
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] Ran upgrade package, yet still says old version in terminal (MAC)

[Magnus Therning]

On 12 Sep 2015 11:32 pm, "Robert Marshall"  wrote:
>
> Hi all,
>
> Running OSX Yosemite 10.10.5 on a Mac Mini. I checked and the currently
installed version of Git comes up at 2.3.2 in the terminal prompt. I
downloaded the latest build package, which is 2.5.0, released earlier this
month.
>
> At this point I opened the dmg file and ran the
git-2.5.0-intel-universal-mavericks.pkg file, and followed the instructions
to install the package. After receiving "The Software Package was
Successfully Installed Message" I checked the version again. However, it is
still showing 2.3.2 as being installed.
>
> I even logged out, and back in. But, it's still showing the older version.
>
> Is the installer not working properly, or am I missing a step somewhere
along the lines?

It could be a simple issue with $PATH. Check where your shell says Git is
and see if that matches with the location you'd expect.

/M

-- 
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] Rebase ... I am completely confused

[Philip Oakley]

From: "Michael" : Saturday, September 12, 2015 
12:31 AM

On 2015-09-11, at 12:43 AM, Philip Oakley  wrote:

From: "Philip Oakley" 

From: "Michael" 
I don't understand this last statement. Perhaps a graph showing 
the arrangement may help de-confuse which are 'off of' and which 
are 'on to'.


Sure; how to generate that graph?


You can also use 'git show-branch' etc with limiting of the number of 
commits to show to get a vertical flow, as long as the sequence isn't 
too deep, which may be reasonable in your case.

--
Philip


Ok


I think you needed to check the manual and it's example first for the 
best invocation ;-)


IIRC you only mentioned RebaseSimpleMerge and RemoveDebugSpam branches, 
so you'd put them on the command line, adding more branches until you 
have sufficient to show just what you need.




With no parameters, (IIUC) you have implied _all_ those branches shown 
("all refs under refs/heads and/or refs/tags"), which wasn't what you 
needed.


The first block lists a "!" column marker then the branch name for that 
column.

The current branch uses "*", so you are on  "throw-away".


! [CofhFix] Run our Block table change after CofhCore (override them). 
Fixes compatibility with CofhCore / Redstone Flux / RfTools.

! [CommandToToggleFlow] Merge branch 'WhyDoesItCrashP' into throw-away
 ! [FixThreadAllocation] Fix a bug in allocating worker threads
  ! [RebaseSimpleMerge] Run our Block table change after CofhCore 
(override them). Fixes compatibility with CofhCore / Redstone Flux / 
RfTools.
   ! [RemoveDebugSpam] First step in rebuilding the released source --  
remove debug spam
! [Reparent] See if reparenting the liquid class solves 
compatibility with streams, etc
 ! [Trial-Merge] Merge branch 'WhyDoesItCrashP' into Trial-Merge 
Primary: Debugging printfs (shows in launcher log)
  ! [WhyDoesItCrashP] Fix to debugging data, flag first run 
properly
   ! [master] Update mcmod.info. Remove it from bin/ as that's an 
output.
! [simple_pressure] More scheduling adjustments - Some aspects 
of scheduling CAN FREEZE THE SERVER ATM

 * [throw-away] Merge branch 'WhyDoesItCrashP' into throw-away
  ! [origin/Cofh] Bin/mcmod.info should NOT be in git. It is 
generated during build.

   ! [origin/HEAD] Conflict fix for gitignore
! [origin/IntegrationTest] Merge branch 
'FixThreadAllocation' into IntegrationTest

 ! [origin/master] Conflict fix for gitignore
  ! [origin/pressure] Pressure works now, but lags in deep 
oceans
   ! [origin/simple_pressure] More scheduling 
adjustments - Some aspects of scheduling CAN FREEZE THE SERVER ATM
! [origin/throw-away] Merge branch 'WhyDoesItCrashP' 
into throw-away

--


Here we see the commit trail. Newest first.
The first commit shows a "-" (a merge) under the above "* [throw-away]" 
column;  sort of what you'd expect


 -[Trial-Merge] Merge branch 'WhyDoesItCrashP' into 
Trial-Merge Primary: Debugging printfs (shows in launcher log)
+  +  +[CofhFix] Run our Block table change after CofhCore 
(override them). Fixes compatibility with CofhCore / Redstone Flux / 
RfTools.


IIUC, here are the three + marks for merge, then the (?first parent) 
branch name.



+  +  + +  [master] Update mcmod.info. Remove it from bin/ as 
that's an output.
+  +  + +  [master^] Srg/Mcp conf files are needed in the 
eclipse environment
--  - [CommandToToggleFlow] Merge branch 'WhyDoesItCrashP' 
into throw-away
+++  *  + [WhyDoesItCrashP] Fix to debugging data, flag first 
run properly

+*  + [CommandToToggleFlow^] missed a line in the merge
--  - [CommandToToggleFlow~2] Merge branch 
'IntegrationTest' into throw-away
--  -   - [origin/IntegrationTest] Merge branch 
'FixThreadAllocation' into IntegrationTest
++   +   *  +   + [FixThreadAllocation] Fix a bug in allocating worker 
threads
--  - [CommandToToggleFlow~3] Merge branch 
'whydoesitcrashp' into throw-away
+++  *  + [WhyDoesItCrashP^] More debugging. This makes no 
sense -- it is not adding enough threads, and the scheduling is a mess
--  - [CommandToToggleFlow~4] Merge branch 
'WhyDoesItCrashP' into throw-away

+++  *  + [WhyDoesItCrashP~2] Track the thread size
+++  *  + [WhyDoesItCrashP~3] 1. Debugging statements to add 
to integration test. 2. "Uncommented", and re-formatted, one of the 
rain/evaporation routines. -- That needs to go into master, but it 
requires adding getters/setters to the parent FiniteFluid block. Which 
are needed.
--  -   - [CommandToToggleFlow~5] Merge branch 'reparent' into 
IntegrationTest
+   ++   *  +   + [Reparent] See if reparenting the liquid class 
solves compatibility with streams, etc

  * +++  + [origin/HEAD] Conflict