Stack Overflow
Stack Overflow

Questions tagged [fixup]

Use fixup for questions related to an assembler opcode which references an external symbol using a default address to represent an unknown address which is subsequently replaced with an actual numeric address when that information is known.

References

16 questions
178
votes
8 answers

What's the difference between "squash" and "fixup" in Git/Git Extension?

I've been using Git Extensions for a while now (it's awesome!) but I haven't found a simple answer to the following: Sometimes, when typing a commit message, a make a typo. My friend showed me how to fix it the following way (in Git…
Placeholder
  • 4,651
  • 6
  • 33
  • 35
6
votes
4 answers

Programmatically fixup last commit into previous

Every time I want to fixup my latest commit into the second latest commit, I do this git rebase HEAD~2 -i Is there a way to do this in an automated script, without human interference? I tried this and it doesn't…
iBug
  • 35,554
  • 7
  • 89
  • 134
5
votes
3 answers

git rebase -i -autosquash conflict

git is giving me a major headache when using --fixup and --autosquash. I would like to give two examples, one working perfectly fine and the other being a mess. (git version 2.6.2) Working example: First commit: $ git init $ printf '1\n' >…
JohnDuhh
  • 53
  • 4
5
votes
2 answers

Definition of fix-up?

I've seen this term in the Python Lisp compiler and some C linker's sources. My guess is that a fix-up is just some wrapper around an Assembly routine that makes sure the alignment is right, but I'm not sure at all about anything here.
Leslie P. Polzer
  • 2,998
  • 21
  • 18
4
votes
1 answer

Does git have a shortcut command to fix up HEAD into HEAD~1

I find myself doing this sometimes: git rebase -i HEAD~2 This shows me two commits, HEAD~1 and HEAD. I change pick to f to fix up HEAD into HEAD~1. Now I combined my two most recent commits into a single commit that only has the commit message from…
Kevin
  • 175
  • 1
  • 9
3
votes
1 answer

Non-interactive fixup until specified hash

Let’s say I have hour commits * 7bd4815 (HEAD) four * afe9410 third * db064dd second * 46ab932 first There are no uncommitted changes. What I want to do is non-interactively squash everything after first, into it. I want the equivalent of pick…
user137369
  • 5,219
  • 5
  • 31
  • 54
3
votes
2 answers

What does "vtable fixup" mean?

I have heard this term, "vtable fixup", used. What does it mean? I had no success asking Google. I already know what a vtable is so that does not need to be defined.
Sid Tulley
  • 33
  • 3
3
votes
1 answer

EF anonymous object query returns null collections instead of empty ones

I'm using this trick to perform conditional Include's with EF. http://blogs.msdn.com/b/alexj/archive/2009/10/13/tip-37-how-to-do-a-conditional-include.aspx The problem I'm having is that any collections that don't have records, are null, and not…
user2301328
  • 33
  • 4
2
votes
3 answers

Git - Is it safe to rebase while main IDE is open?

I'm someone which often rebases feature-related commits for fixing them up. Lately I've been concerned in whether having the main coding IDE open can affect something going wrong in the rebase process. For instance, when there's a "pause" within the…
Adrián
  • 45
  • 1
  • 3
  • 12
2
votes
2 answers

Is it possible to easily move all commits from one branch onto another as one commit?

I know, I can do an interactive rebase, reword first commit and fixup all other. But if a branch contains hundreds of commits it becomes very tedious. Is there a simpler way?
Victor Dombrovsky
  • 2,955
  • 3
  • 21
  • 33
2
votes
2 answers

Entity Framework 4 entity with storegeneratedpattern = none doesn't update foreign keys when saved

I have an entity that has an int as its primary key that is set to storegeneratedpattern = none so that we provide the id client side. This entity has child entities that reference back to it via an association with navigation and foreign key…
Darren Hall
  • 97
  • 1
  • 1
  • 9
1
vote
1 answer

Should I rip out the Association Fixup code from my Entity Framework T4 Template?

Can someone clarify my thinking on association fixup code in Entity Framework (T4 generated POCOs) please? A recent comment regarding fix-up stated 'For example code-first doesn't use them and everything still works'. I'm a little confused on this…
Mark Chidlow
  • 1,432
  • 2
  • 24
  • 43
1
vote
0 answers

64 bit assembly fixup error

I'm trying to run a test program the prof gave us for 64- bit assembly, and it's not worker properly. the error is: error LNK2017: 'ADDR32' relocation to 'naturals' invalid without /LARGEADDRESSAWARE:NO fatal error LNK1165: link failed because of…
student
  • 57
  • 1
  • 5
0
votes
0 answers

Adding a .size attribute to nodes in Red-Black Binary tree (Pseudo code)

In my CS class I've been given the task to add a size attribute to nodes in a Red-Black Binary tree. The size of a node, is the number of nodes in its sub trees. This attribute has to be updated, when changes is made to the RB tree, more…
ninjarubberband
  • 83
  • 5
0
votes
1 answer

How does git keep track of the commit hash marked with a fixup/squash flag?

I know that git commit --fixup can make a commit B that will be combined with commit A, when executing git rebase -i --autosquash. And when I run git log, my commit log looks something like commit Author:…
PROgram52bc
  • 98
  • 1
  • 1
  • 8
1
2