Junio C Hamano wrote:
> In the end, simple cases (the canonical example being Linus keeping
> a local change to "Name = Unicycling Gorilla" in his Makefile while
> running dozens of "git pull" every day) would not be helped with
> this feature very much because there is rarely overlap, while in a
> complex case the user really needs help to save away his WIP, the
> user is forced to resolve the conflict immediately upon the failed
> "stash pop" at the end of "git pull". If the conflict turns out to
> be something the user would not want to resolve at that moment, the
> user needs to know the way out, something like:
> git reset --hard ;# go back to the result of pull
> git checkout -b wip ORIG_HEAD ;# start from before the pull
> git stash pop ;# recover his wip
> ... perhaps work a bit more ...
> git commit -a -m wip ;# save it away for safety
> git checkout - ;# result of pull
> so that he can come back tomorrow, check out "wip" branch, and
> decide what to do.
What does this have to do with pull at all? git-pull.sh is a simple
shell script that runs fetch followed by a merge or rebase. You're
handling a merge now, and there's proper support for it in the tool;
git merge --abort will work with one caveat: "If there were
uncommitted worktree changes present when the merge started, git merge
--abort will in some cases be unable to reconstruct these changes. It
is therefore recommended to always commit or stash your changes before
running git merge.", to directly quote the manpage. Really, it has
the same problem as rebase, if you want --abort to work.
"Fixing" git merge --abort and git rebase are topics for another day.
What I'm doing it making it easier to work with the merge/rebase
following the fetch by automatically stashing worktree + index
> The "--autosquash" option (or not adding either the configuration or
> the option) would encourage the user to think about the nature of
> WIP he has in the working tree before running "git pull".
I'm lost. What does git rebase --autosquash (or rebase.autosquash)
have anything to do with git pull --autostash?
> Is it a
> too complex beast that may interfere with what others are doing, or
> is it a trivial change that he can stash away and pop it back? If
> the former, he will be far better off doing "checkout -b", keep
> working until the local change gets into somewhat a better shape and
> "commit", before pulling into the original branch.
A pull-merge person having complex worktree changes should not execute
git pull blindly in the first place. That's what git fetch is for:
inspect the incoming changes, and decide how to integrate it into the
local branch. git pull is a tool that serves an entirely different
purpose, in my opinion.
> But I suspect that pull.autostash
> configuration is not a good addition because it encourages a bad,
> pain-inducing workflow. In simple cases it may not hurt, but when
> local changes are complex, it would actively hurt than not having it,
> and the configuration robs the incentive to choose.
But I'm a pull-rebase guy, and I always want pull.autostash. Will you
deny me the configuration variable, simply because it is potentially
pain-inducing to pull-merge people who set it blindly and run git pull
I'm not arguing linking pull.autostash to pull.rebase either: my
change is admittedly useful to *some* pull-merge people. And I'm not
arguing for making it true by default.
> The equation is somewhat different for "pull-rebase", as "rebase"
> insists you to start from a clean working tree, so "download and
> then stop" annoyance feels bigger. I have a suspicion that
> loosening that may be a more productive fix to the real problem.
Rebase performs relatively simple operation on the worktree, and I
would like to keep it that way. I have no desire to "fix" rebase.
> (require_clean_work_tree --quiet) || git stash
Good point. Will fix in the next iteration.
> This "cannot pop stash" is really where the user gets in the deep
> yoghurt and needs help.
Yes, and your point being? That life would've been easier if the user
had committed all those changes in the first place? And that the
penalty for not having done that is now a git checkout wip ORIG_HEAD;
git stash pop; git checkout master; git rebase wip?
> Please resolve conflicts and commit, and then 'git stash pop'.
Cool, will fix.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html