phabricator issue with git submodules.

Edward Z. Yang ezyang at mit.edu
Sat Jul 26 19:39:58 UTC 2014


Hello Karel,

When your submodules get updated, you need to add them to your commit
(since the parent repository maintains pointers to the submodules).
Then they will no longer show up as dirty and you can submit the
Phabricator patch.

Edward

Excerpts from Karel Gardas's message of 2014-07-25 22:48:21 +0100:
> 
> Hi,
> 
> just fixing few warning issues on Solaris/x86. The changes spread over 
> main ghc tree and libraries/primitive and libraries/unix. I already 
> commited changes and pushed to my github.com's forks of 
> libraries/primitive and libraries/unix. The git status looks then:
> 
> $ git status
> On branch master
> Your branch is ahead of 'origin/master' by 2 commits.
>    (use "git push" to publish your local commits)
> 
> Changes not staged for commit:
>    (use "git add <file>..." to update what will be committed)
>    (use "git checkout -- <file>..." to discard changes in working directory)
> 
>          modified:   libraries/primitive (new commits)
>          modified:   libraries/unix (new commits)
> 
> no changes added to commit (use "git add" and/or "git commit -a")
> 
> 
> and yet phabricator still complains about it:
> 
> $ arc diff
> You have unstaged changes in this working copy.
> 
>    Working copy: /export/home/karel/vcs/ghc-src/validate-fixes/
> 
>    Unstaged changes in working copy:
>      libraries/primitive
>      libraries/unix
> 
> 
>      Do you want to amend these files to the commit? [y/N]
> 
> Usage Exception: Stage and commit (or revert) them before proceeding.
> 
> I pressed enter in question above.
> 
> Is that a known issue or am I doing something wrong here?
> 
> Thanks!
> Karel


More information about the ghc-devs mailing list