    git am --abort

worked for me, but `git rebase --abort` did not.

What happened: I tried to apply a patch but it had been corrupted (likely by [Gmail copy pasting in body](https://productforums.google.com/forum/#!topic/gmail/HasB4x0gdz8;context-place=forum/gmail)):

    git am bad.patch

And Git said:

    Applying: python: fix Linetable case to LineTable in docstrings and comments
    fatal: corrupt patch at line 56
    Patch failed at 0001 python: fix Linetable case to LineTable in docstrings and comments
    The copy of the patch that failed is found in:
       /home/ciro/git/binutils-gdb/src/.git/rebase-apply/patch
    When you have resolved this problem, run &quot;git am --continue&quot;.
    If you prefer to skip this patch, run &quot;git am --skip&quot; instead.
    To restore the original branch and stop patching, run &quot;git am --abort&quot;.

Note how git gives out the solution: `To restore the original branch and stop patching, run &quot;git am --abort&quot;.`

Then I obviously ignored the message, and tried a fixed version immediately:

    git am good.patch

and got the error.

Ok, it turned out I needed to delete the directory `.git/rebase-apply`. It works after that (or at least gives me different errors, saying the email is wrong again). I still have no idea what the error actually means or why there was an error.

**Edit:** As the comments below suggest, `git am --abort` or `git rebase --abort` might be a better way to fix the problem, but I have not tested it.

I&#39;m trying to test a simple PHP page using the Chrome extension Postman. When I send URL parameters, the script works fine (eg the variables are available in the `$_REQUEST` parameter). When I send them as `x-www-form-urlencoded` parameters, the `$_REQUEST` parameter only contains the `PHPSESSID`.

The script:

    &lt;?php
    var_export($_REQUEST);
    ?&gt;

When I send URL parameters, `$_REQUEST` includes them:
![URL parameters][1]

But when I send them as **`POST`** variables, `$_REQUEST` doesn&#39;t include them:
![enter image description here][2]

What am I missing?


  [1]: http://i.stack.imgur.com/yggiU.png
  [2]: http://i.stack.imgur.com/BR24z.png

Sending POST parameters with Postman doesn&#39;t work, but sending GET parameters does

I have Swagger API Declaration for services using [Swagger v 1.2](https://github.com/wordnik/swagger-spec/blob/master/versions/1.2.md).

My original feeling about Swagger was that it is very close to JSON Schema (Draft 3 and lately Draft 4) and it shall be relatively easy to generate JSON Schema for request and response objects.

However, while part of the Swagger reuses JSON Schema structures, it turned out that it uses only a subset of features, and it also introduces its own inheritance in Models (using `subTypes` and `discriminator`).

Question: Is there any existing project or piece of code which can **generate usable JSON Schema from Swagger API Declaration**?

Optimally JSON Schema Draft 4 and using Python (but I will be happy to find anything).

How to generate JSON-Schema from Swagger API Declaration

I&#39;m trying to apply a patch, which I took from http://www.winehq.org/pipermail/wine-devel/2014-May/104356.html. I copied it into a text editor, and saved it as `my.patch` (I needed to fix the email, it had been obfuscated).

I tried to apply it with Git, but I&#39;m getting this error:

    sashoalm@sashoalm-VirtualBox:~/Desktop/wine-git$ git am --signoff &lt;my.patch
    previous rebase directory /home/sashoalm/Desktop/wine-git/.git/rebase-apply still exists but mbox given.

This cryptic error message gives me no idea what&#39;s wrong or what I need to do to make it work. What does this error mean? And how do I fix it?

Git error: previous rebase directory .git/rebase-apply still exists but mbox given

I'm trying to apply a patch, which I took from <a href="http://www.winehq.org/pipermail/wine-devel/2014-May/104356.html" target="_blank" rel="noopener noreferrer">http://www.winehq.org/pipermail/wine-devel/2014-May/104356.html</a>. I copied it into a text editor, and saved it as <code>my.patch</code> (I needed to fix the email, it had been obfuscated).
I tried to apply it with Git, but I'm getting this error:
<pre><code class="hljs language-bash">sashoalm@sashoalm-VirtualBox:~/Desktop/wine-git$ git am --signoff &#x3C;my.patch
previous rebase directory /home/sashoalm/Desktop/wine-git/.git/rebase-apply still exists but mbox given.
</code></pre>
This cryptic error message gives me no idea what's wrong or what I need to do to make it work. What does this error mean? And how do I fix it?


I’m using Ansible 1.5.3 and Git with ssh agent forwarding (https://help.github.com/articles/using-ssh-agent-forwarding).  I can log into the server that I am managing with Ansible and test that my connection to git is correctly configured:

    ubuntu@test:~$ ssh -T git@github.com
    Hi gituser! You&#39;ve successfully authenticated, but GitHub does not provide shell access.


I can also clone and update one of my repos using this account so my git configuration looks good and uses ssh forwarding when I log into my server directly via ssh.

The problem:  When I attempt the same test shown above using the Ansible command module. It fails with “Permission denied”.  Part of the Ansible output (with verbose logging) looks like this:

    failed: [xxx.xxxxx.com] =&gt; {&quot;changed&quot;: true, &quot;cmd&quot;: [&quot;ssh&quot;, &quot;-T&quot;, &quot;git@github.com&quot;], &quot;delta&quot;: &quot;0:00:00.585481&quot;, &quot;end&quot;: &quot;2014-06-09 14:11:37.410907&quot;, &quot;rc&quot;: 255, &quot;start&quot;: &quot;2014-06-09 14:11:36.825426&quot;}
    stderr: Permission denied (publickey).


Here is the simple playbook that runs this command:

    - hosts: webservers
      sudo: yes
      remote_user: ubuntu
    
      tasks:
    
      - name: Test that git ssh connection is working.
        command: ssh -T git@github.com


The question:  why does everything work correctly when I manually log in via ssh and run the command but fail when the same command is run as the same user via Ansible?

I will post the answer shortly if no one else beats me to it.  Although I am using git to demonstrate the problem, it could occur with any module that depends on ssh agent forwarding.  It is not specific to Ansible but I suspect many will first encounter the problem in this scenario.

SSH Agent Forwarding with Ansible

I&#39;m trying to understand more clearly the `.gitignore` syntax, and in particular as far as [https://github.com/github/gitignore][1] gitignores are concerned.

I see that the leading slash is used to match only pathnames relative to the location of the `.gitignore` file (from [http://git-scm.com/docs/gitignore][2]):

&gt; A leading slash matches the beginning of the pathname. For example, &quot;/*.c&quot; matches &quot;cat-file.c&quot; but not &quot;mozilla-sha1/sha1.c&quot;.

But what happens when i remove the leading slash? As far as what i understood, there are two cases:

 1. If the pattern does not contain a slash (or it contains only a trailing slash, which means that it should match a directory), the search is performed inside the entire directory tree. For example, the pattern `dir/` will match `&lt;root&gt;/dir`, `&lt;root&gt;/a/dir`, `&lt;root&gt;/a/b/c/.../dir`, etc., where `&lt;root&gt;` is the location of the `.gitignore` file.
 2. If the pattern contains a slash, which is not in the trailing position (it&#39;s not the last character), then it is matched only with pathnames relative to the `.gitignore` file location.

These are the examples i made to check this behaviour:

    # Directory structure:
    &lt;root&gt;
    ├─ dir/
    │   └─ test
    ├─ src/
    │   ├─ dir/
    │   │   └─ test
    test file is there only because Git does not track empty directories.

First test:

    # .gitignore
    dir/

    # git status
    nothing to commit

So Git is ignoring both `dir` directories. This is consistent with case number 1: the pattern has no slashes (except for the trailing one), so Git is watching the entire directory tree, ignoring everything that matches the pattern.

Second test:

    # .gitignore
    /dir/

    # git status
    Untracked files:
        src/

Here, Git is ignoring only the `dir` directory directly beneath the root directory, thanks to the leading slash in the pattern.

Third test:

    # .gitignore
    dir/*

    # git status
    Untracked files:
        src/

This is consistent with the case number 2: the pattern has some slash inside it, so it is considered as a pathname starting from the root directory.

Now it&#39;s time for the real question. Let&#39;s consider [this gitignore file][3]: when they ignore the directory `downloader/`, for example, aren&#39;t they actually ignoring every single `downloader` directory found in the entire directory tree? This is what i&#39;m driven to think since what i saw about Git&#39;s workings before.

So if i happen to have a custom module with a `downloader` directory inside of it, will it be unexpectedly ignored as well as the regular one in the root of Magento? This is a bit of a rethorical question because it actually already happened to me, producing a really hard to find bug.

So, in the Magento `.gitignore` file (which i&#39;m referring to only as an example, btw) a lot of the patterns contain slashes, so they are correctly matched against pathnames starting from the root, but there are a few cases, like `downloader/` or `errors/` that, if i&#39;m not mistaken, are potentially dangerous, and which should probably be changed to `/downloader/` and `/errors/`.

As a more general question, should i always use the leading slash for patterns not containing slashes (except for the trailing one) when i want to select a pathname explicitly starting from root, and not to use it for patterns containing slashes, or should i always use the leading slash for clarity? What do you think about it?

Thank you for reading and sorry for the long post.


  [1]: https://github.com/github/gitignore
  [2]: http://git-scm.com/docs/gitignore
  [3]: https://github.com/github/gitignore/blob/master/Magento.gitignore

When to use leading slash in gitignore

I&#39;m new to Github and Generating SSH Keys look a neccessity. And was informed by my boss about this, so I need to comply.

I successfully created SSH Key but when I&#39;m going to add it to the ssh-agent

this is what happens

What seems to be the problem?

![enter image description here][1]


  [1]: http://i.stack.imgur.com/LpZUj.png

Git Bash: Could not open a connection to your authentication agent

I have a pull request that is requesting a merge into master from my branch, but the owner wants me to change the request to merge into a different branch from my branch.

Is this possible? What are the possible solutions?

How to modify a pull request on GitHub to change target branch to merge into?

Is it possible to configure git diff to respect indentation and syntax?
I am not talking about ignoring indentation and spaces, but rather to use blank lines, indentation levels and possibly brackets, to help matching the old lines to new lines.

E.g. git diff often cuts through functions and their docblock, like this:


     class C {
     
       /**
    +   * Goes to the bar.
    +   */
    +  function bar() {
    +    return &#39;bar&#39;;
    +  }
    +
    +  /**
        * Gets your foo up to date.
        */
       function foo() {

When I would prefer

     class C {
    +
    +  /**
    +   * Goes to the bar.
    +   */
    +  function bar() {
    +    return &#39;bar&#39;;
    +  }
     
       /**
        * Gets your foo up to date.
        */
       function foo() {

In this example it is still quite harmless, but there are examples where functions and their docblock are really ripped apart due to the greedy and naive diff implementation.

Note: I already configured `*.php diff=php` in `~/.gitattributes`.

EDIT: Another example:
Here git diff mixes a property docblock with a method docblock:

       /**
    -   * @var int
    +   * @param string $str
        */



git diff algorithm that does not rip functions apart? (language-aware diff)

I need to do a `PATCH` request with the `Windows.Web.Http.HttpClient` class and there is no official documentation on how to do it. How can I do this?

PATCH Async requests with Windows.Web.Http.HttpClient class

I work on WordPress based project and I want to patch my project at each new release version of WP. For this, I want generate a patch between two commits or tags.

For example, in my repo `/www/WP` I do this:
```bash
$ git patch-format com1..com2 --stdout &gt; &#39;~/patchs/mypatch.patch&#39;

# or

$ git patch-format tag1..tag2 --stdout &gt; &#39;~/patchs/mypatch.patch&#39;
```

`/www/WP` git natif WordPress

`/www/myproject` My git project WordPress based


The `git apply` command line doesn&#39;t work, I think because we are in different repositories.

Can I generate a patch file without a commit, just a differential and apply it to another git repository?

Thank you.

Create patch or diff file from git repository and apply it to another different git repository

According to my knowledge:

- `PUT` - update object with its whole representation (replace)
- `PATCH` - update object with given fields only (update)

I&#39;m using Spring to implement a pretty simple HTTP server. When a user wants to update his data he needs to make a HTTP `PATCH` to some endpoint (let&#39;s say: `api/user`). His request body is mapped to a DTO via `@RequestBody`, which looks like this:

    class PatchUserRequest {
        @Email
        @Length(min = 5, max = 50)
        var email: String? = null
    
        @Length(max = 100)
        var name: String? = null
        ...
    }

Then I use an object of this class to update (patch) the user object:

    fun patchWithRequest(userRequest: PatchUserRequest) {
        if (!userRequest.email.isNullOrEmpty()) {
            email = userRequest.email!!
        }
        if (!userRequest.name.isNullOrEmpty()) {
            name = userRequest.name
        }    
        ...
    }

My doubt is: what if a client (web app for example) would like to clear a property? I would ignore such a change. 

**How can I know, if a user wanted to clear a property (he sent me null intentionally) or he just doesn&#39;t want to change it? It will be null in my object in both cases.**

I can see two options here:

- Agree with the client that if he wants to remove a property he should send me an empty string (but what about dates and other non-string types?)
- Stop using DTO mapping and use a simple map, which will let me check if a field was given empty or not given at all. What about request body validation then? I use `@Valid` right now.

How should such cases should be properly handled, in harmony with REST and all good practices?

**EDIT:**

One could say that `PATCH` shouldn&#39;t be used in such an example, and I should use `PUT` to update my User. But what about model changes (e.g. adding a new property)? I would have to version my API (or the user endpoint alone) after every User change. E.g. I would have `api/v1/user` endpoint which accepts `PUT` with an old request body, and `api/v2/user` endpoint which accepts `PUT` with a new request body. I guess it&#39;s not the solution and `PATCH` exists for a reason.

How to do PATCH properly in strongly typed languages based on Spring - example

I&#39;ve been trying to implement some unit tests for a module. An example module named *alphabet.py* is as follows:

    import database

    def length_letters():
        return len(letters)

    def contains_letter(letter):
        return True if letter in letters else False


    letters = database.get(&#39;letters&#39;)   # returns a list of letters


I&#39;d like to mock the response from a database with some values of my choice, but the code below doesn&#39;t seem to work.

    import unittests  
    import alphabet   
    from unittest.mock import patch   
      
      
    class TestAlphabet(unittest.TestCase): 
        @patch(&#39;alphabet.letters&#39;)
        def setUp(self, mock_letters):
            mock_letters.return_value = [&#39;a&#39;, &#39;b&#39;, &#39;c&#39;]   
      
        def test_length_letters(self):
            self.assertEqual(3, alphabet.length_letters())
          
        def test_contains_letter(self):   
            self.assertTrue(alphabet.contains_letter(&#39;a&#39;))


I have seen many examples in which &#39;patch&#39; is applied to methods and classes, but not to variables. I prefer not to patch the method *database.get* because I may use it again with different parameters later on, so I would need a different response.

What am I doing wrong here?

Mocking a global variable

I know it seems fairly redundant to have a title for a legend, but is it possible using matplotlib?

Here&#39;s a snippet of the code I have:

    import matplotlib.patches as mpatches
    import matplotlib.pyplot as plt

    one = mpatches.Patch(facecolor=&#39;#f3f300&#39;, label=&#39;label1&#39;, linewidth = 0.5, edgecolor = &#39;black&#39;)
    two = mpatches.Patch(facecolor=&#39;#ff9700&#39;, label = &#39;label2&#39;, linewidth = 0.5, edgecolor = &#39;black&#39;)
    three = mpatches.Patch(facecolor=&#39;#ff0000&#39;, label = &#39;label3&#39;, linewidth = 0.5, edgecolor = &#39;black&#39;)

    legend = plt.legend(handles=[one, two, three], loc = 4, fontsize = &#39;small&#39;, fancybox = True)

    frame = legend.get_frame() #sets up for color, edge, and transparency
    frame.set_facecolor(&#39;#b4aeae&#39;) #color of legend
    frame.set_edgecolor(&#39;black&#39;) #edge color of legend
    frame.set_alpha(1) #deals with transparency
    plt.show()

I would want the title of the legend above label1. For reference, this is the output:
[![Showing legend][1]][1]


  [1]: https://i.stack.imgur.com/qK0hz.png

Content Type	Original Author	Original Content on Stackoverflow
Question	sashoalm	View Question on Stackoverflow
Solution 1 - Git	Ciro Santilli Путлер Капут 六四事	View Answer on Stackoverflow
Solution 2 - Git	sashoalm	View Answer on Stackoverflow

Git error: previous rebase directory .git/rebase-apply still exists but mbox given

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

How to generate JSON-Schema from Swagger API Declaration

Sending POST parameters with Postman doesn't work, but sending GET parameters does

Attributions