On Wed, Mar 16, 2011 at 6:57 PM, Neal Kreitzinger <nkreitzinger@xxxxxxxxx> wrote: > On 3/15/2011 2:48 PM, Piotr Krukowiecki wrote: >> >> On Mon, Mar 14, 2011 at 11:21 PM, Neal Kreitzinger >> <nkreitzinger@xxxxxxxxx> wrote: >>> >>> On 3/11/2011 12:47 PM, Piotr Krukowiecki wrote: >>>> >>>> Hi, >>>> >>>> I wanted to do something like "Testing partial commits" described in >>>> git-stash documentation (see end of mail for reference). I think this >>>> is a common scenario: you start working on some feature, then discover >>>> a bug, start fixing it, but realize it needs more work. So now you have >>>> two features that needs more work (both are not ready for committing). >>>> >>>> The documentation says to use --keep-index in this case. >>>> >>>> The problem is that --keep-index leaves changes in index intact, but at >>>> the same time it saves them in stash. So if I edit those changes I'm >>>> likely >>>> to get conflicts when applying the stash. >>>> >>>> For example: >>>> >>>> $ git init&& echo a> a&& git add .&& git commit -m a >>>> $ echo x> a&& git add a&& git stash save --keep-index >>>> $ echo y> a&& git add a&& git commit -m y >>>> $ git stash pop >>>> Auto-merging a >>>> CONFLICT (content): Merge conflict in a >>>> >>>> Maybe --keep-index should not stash staged changes? This would fix this >>>> problem. And I can't think of a situation when would want to stash >>>> changes >>>> and at the same time keep them. >>>> >>>> If --keep-index works correctly maybe a new option, for example >>>> --index-only >>>> (or --cached-only?) could be introduced? >>>> >>>> >>>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >>>> >>>> Testing partial commits:: >>>> >>>> You can use `git stash save --keep-index` when you want to make two or >>>> more commits out of the changes in the work tree, and you want to test >>>> each change before committing: >>>> + >>>> ---------------------------------------------------------------- >>>> # ... hack hack hack ... >>>> $ git add --patch foo # add just first part to the index >>>> $ git stash save --keep-index # save all other changes to the stash >>>> $ edit/build/test first part >>>> $ git commit -m 'First part' # commit fully tested change >>>> $ git stash pop # prepare to work on all other changes >>>> # ... repeat above five steps until one commit remains ... >>>> $ edit/build/test remaining parts >>>> $ git commit foo -m 'Remaining parts' >>>> ---------------------------------------------------------------- >>>> >>>> >>> behind-the-scenes, git stash saves your working tree as a commit and your >>> index as another commit. "git-stash apply" and "git-stash pop" only >>> apply >>> your stashed-index if you do "git-stash-apply --index". The default is >>> to >>> only apply your stashed-work-tree. You can create new branches from your >>> stashes with "git-stash branch". You may find that much better to deal >>> with >>> for managing your work. Stashes aren't really intended to be the primary >>> way to manage your work, but instead are a supplement. Branches are a >>> better main tool for managing work. You can create a branch from your >>> stash >>> and when the branch is ready you can merge it into your other branch. >> >> Thanks for explanation, I understand there is not much pressure on >> improving it. >> >> But it still does not explain how leaving code in index (with >> --keep-index) while >> still stashing it might be helpful? >> >> I would understand the use of --index-only (I gave an example of use >> case), >> or even --workdir-only, but not --keep-index. If I'm missing something >> please >> correct me. >> >> > Keep in mind that a key to his workflow is "git-add --patch" method (which > you did not include in your example). I did - in my first mail. > The workflow of the manpage assumes > you will have to resolve conflicts in such a case. If you look at the > "Pulling into a dirty tree" workflow of the same manpage its obvious that > this workflow will almost always get conflicts, but they don't explicitly > include conflict resolution in the example. ok, for this workflow, when you stash away your changes to do a pull, you can't do anything to avoid conflicts. I mean this case: > You could resolve the conflicts > for "Testing partial commits" in this way: > > Neal's Version of Testing partial commits:: > ---------------------------------------------------------------- > # ... hack hack hack ... > $ git add --patch foo # add just first part to the index > $ git stash save --keep-index # save all other changes to the stash > $ edit/build/test first part > $ git commit -m 'First part' # commit fully tested change > $ git stash pop # prepare to work on all other changes > (conflict resolution) > $ edit conflicted file # keep new version of the hunk already > # committed in prior iteration > $ git reset HEAD -- foo # clear conflict from index > $ git reset HEAD -- foo # (again) reset index to match HEAD > # ... repeat above five (or eight) steps until one commit remains ... > $ edit/build/test remaining parts > $ git commit foo -m 'Remaining parts' > ---------------------------------------------------------------- > > Maybe there's a better way to do this. Hope this helps. How about following workflow? # ... hack hack hack ... $ git add --patch foo $ git stash save --keep-index $ build/test first part # note I have removed the "edit" part There are two possibilities now: 1. You're happy with the result - you commit your changes: $ git commit -m 'First part' $ git stash pop Important: there will be no conflicts in this case, and committed changes won't be reverted/applied/conflicted, because you have not edited them! I wasn't fully aware of this before (looks like I'm still new to git). 2. You're not happy with the result - maybe something does not build and you need to stage more changes, or maybe fix is not working yet. You should first pop your stashed changes! This way you'll avoid conflicts, you'll be able to stage/modify other changes. So the next steps are like this: $ git stash pop $ edit/add -p $ git stash save --keep-index and now you're back to the "build/test" part. > (conflict resolution) > $ edit conflicted file # keep new version of the hunk already > # committed in prior iteration > $ git reset HEAD -- foo # clear conflict from index > $ git reset HEAD -- foo # (again) reset index to match HEAD I'm not really sure why/how this works :/ -- Piotr Krukowiecki -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html