Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Another fix for #557 #565

Closed
wants to merge 56 commits into from
Closed

Another fix for #557 #565

wants to merge 56 commits into from

Commits on Jun 16, 2012

  1. Merge branch 'master' into next

    sigma committed Jun 16, 2012
    Copy the full SHA
    3b17726 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2012

  1. Merge branch 'master' into next

    sigma committed Jul 14, 2012
    Copy the full SHA
    d2ae189 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into next

    sigma committed Jul 14, 2012
    Copy the full SHA
    e8d5e31 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into next

    sigma committed Jul 14, 2012
    Copy the full SHA
    6d7d8ef View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2012

  1. Copy the full SHA
    839f575 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    9f8e88e View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2012

  1. magit-push: only push to branch.b.merge when pushing to branch.b.remote

    The branch specified by the former is only meaningful when pushing to
    the remote specified by the latter.  When pushing to another remote
    and the remote branch is not specified explicitly then pusing to the
    remote branch with the same name as the local branch being pushed is
    much more reasonable than pushing to branch.b.merge which could be
    anything.  This is also how "git push <remote> <branch>" behaves.
    tarsius committed Aug 20, 2012
    Copy the full SHA
    a44a08c View commit details
    Browse the repository at this point in the history
  2. always respect value of magit-set-upstream-on-push

    Previously both branch.<name>.remote and branch.<name>.merge where set
    under certain conditions ignoring the value of magit-set-upstream-on-push:
    when both branch.<name>.remote and remote.origin.url are unset
    branch.<name>.remote was always set.  When additionally no prefix argument
    is used branch.<name>.merge was also set ignoring the value of
    magit-set-upstream-on-push.
    tarsius committed Aug 20, 2012
    Copy the full SHA
    2e0fe4f View commit details
    Browse the repository at this point in the history
  3. magit-builtin-completing-read: handle REQUIRE-MATCH safely

    completing-read does allow the user to exit with null input, leaving
    it to the caller to handle that case.  Possible options would be to
    use some default value or raise an error.
    
    Since magit-builtin-completing-read is a convenience wrapper for
    completing-read it seems reasonable to do the latter here so that not
    every caller of magit-completing-read has to do this on it's own.
    
    A similar change is not required for magit-iswitchb-completing-read
    and magit-ido-completing-read; they already don't allow the user to
    exit with a null value.
    tarsius committed Aug 20, 2012
    Copy the full SHA
    9b11f41 View commit details
    Browse the repository at this point in the history
  4. magit-read-remote: require that an existing remote is selected

    All current uses of magit-read-remote actually require a remote to
    be returned as the behaviour of nil being returned is not defined.
    E.g. magit-push would try to push to a remote with the name "nil".
    
    It would be better to give magit-read-remote a REQUIRE-MATCH argument
    but since all callers expect a match this is not strictly unnecessary
    at the moment.  Also some other magit-read-* functions could benefit
    from a similar change.
    tarsius committed Aug 20, 2012
    Copy the full SHA
    fb2ec93 View commit details
    Browse the repository at this point in the history
  5. magit-push: ensure we are pushing to a branch

    Do this by always using the full ref instead of just the name for
    the remote branch.  Without this we could end pushing to some other
    non-branch ref if no branch by the specified name exists remotely
    but some other ref by that name does.
    tarsius committed Aug 20, 2012
    Copy the full SHA
    dd0d5f6 View commit details
    Browse the repository at this point in the history
  6. magit-push: set branch.<name>.merge correctly

    The backward compatibility hack that ensured that branch.<name>.merge
    was set even when using an old version of git used the wrong local
    variable.  In many cases that variable contains the correct value but
    this does not have to be the case.  More specifically it always used
    the same ref as the ref of the local branch.  When the user selected
    another branch name that obviously is not correct.  So this kludge for
    older git versions could actually harm users of recent versions.
    tarsius committed Aug 20, 2012
    Copy the full SHA
    52a4ea8 View commit details
    Browse the repository at this point in the history
  7. magit-push: do not use magit-get-remote to get the branch-remote

    The meaning of "branch-remote" is "the remote configured for branch"
    but if no remote is configured magit-get-remote might return "origin"
    instead.  This is wrong here because we later use the value of
    branch-remote to determine if we we should push to branch.<name>.merge
    or just <name>.
    
    So this ensures that we do the right thing when branch.<name>.merge is
    set but branch.<name>.remote is not.
    tarsius committed Aug 20, 2012
    Copy the full SHA
    9ccc651 View commit details
    Browse the repository at this point in the history
  8. magit-push: update doc-string to reflect recent changes

    Actually this new doc-string - for the bigger part - would have been
    correct even before these changes since most of them are actually
    bugfixes.  So the new doc-string wouldn't have been more wrong than
    the old one :-)
    
    No longer say that in certain cases something "hairy" is done when
    that behaviour is well defined in git-push(1) and also reasonable.
    Instead explicitly say what is done (pushing to the remote branch
    with the same name as the local branch) and under what conditions.
    
    I think the new doc-string is much easier to understand.  For better
    readability I removed the instructions how prefix arguments are used;
    the user has to get that knowledge elsewhere.  Not every command that
    supports prefix arguments documents that basics of their use; why
    should this one be different?
    tarsius committed Aug 20, 2012
    Copy the full SHA
    23c0fb8 View commit details
    Browse the repository at this point in the history
  9. magit-push: set branch.<name>.merge when -u is in magit-custom-options

    When --set-upstream is set through magit-key-mode use the same
    backward compatibility hack to ensure branch.<name>.merge is set
    even when using an old git version as is used when --set-upstream
    is used due to the value of the magit-set-upstream-on-push option.
    tarsius committed Aug 20, 2012
    Copy the full SHA
    085ec6b View commit details
    Browse the repository at this point in the history
  10. Copy the full SHA
    70366ca View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2012

  1. fix call to magit-read-remote

    sigma committed Sep 16, 2012
    Copy the full SHA
    5b37565 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    9168299 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into next

    sigma committed Sep 16, 2012
    Copy the full SHA
    8f35426 View commit details
    Browse the repository at this point in the history
  4. magit-run*: only magit-mode buffers need to be refreshed

    Refreshing means that point moves to the beginning of the line which
    is not desirable for non-magit-mode buffers.  This fixes issue #441.
    tarsius committed Sep 16, 2012
    Copy the full SHA
    beae52b View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    80f5f95 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'master' into next

    sigma committed Sep 16, 2012
    Copy the full SHA
    bcdea56 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    648f811 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    42bb20f View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2012

  1. magit-key-mode: don't delete other windows to show menu

    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    artagnon committed Sep 22, 2012
    Copy the full SHA
    3b590e0 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2012

  1. Merge branch 'master' into next

    sigma committed Sep 23, 2012
    Copy the full SHA
    7f25553 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    61d9964 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    5167400 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master' into next

    sigma committed Sep 23, 2012
    Copy the full SHA
    bfe5721 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' into next

    sigma committed Sep 23, 2012
    Copy the full SHA
    4d03353 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2012

  1. Copy the full SHA
    0a2f985 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2012

  1. Copy the full SHA
    b051a92 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2012

  1. Copy the full SHA
    5f1d812 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2013

  1. Copy the full SHA
    3325f4b View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    a83f865 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2013

  1. Copy the full SHA
    340aead View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2013

  1. Copy the full SHA
    f3b4fd2 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    8bfb7c1 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2013

  1. Copy the full SHA
    3237c38 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2013

  1. Merge branch 'master' into next

    sigma committed Jan 17, 2013
    Copy the full SHA
    ebba349 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2013

  1. Copy the full SHA
    a127fd3 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    a32a021 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2013

  1. Merge branch 'master' into next

    sigma committed Feb 15, 2013
    Copy the full SHA
    4a2cc80 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into next

    sigma committed Feb 15, 2013
    Copy the full SHA
    cff6630 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2013

  1. magit-section-context-type: de-uglify

    tarsius authored and sigma committed Feb 16, 2013
    Copy the full SHA
    5081e87 View commit details
    Browse the repository at this point in the history
  2. magit-prefix-p: improve doc-string

    The old doc-string wasn't very precise, e.g. it left out that `equal'
    is used for comparison.
    
    Also rename arguments;  It just doesn't feel right to say.
    
      PREFIX is a prefix ... if ...
    
    The hole point of this function is to check whether the first list is
    a prefix of the second.  It might very well not be, so let's just call
    it a list.
    tarsius authored and sigma committed Feb 16, 2013
    Copy the full SHA
    cbf0361 View commit details
    Browse the repository at this point in the history
  3. add new function magit-section-match

    tarsius authored and sigma committed Feb 16, 2013
    Copy the full SHA
    e36af46 View commit details
    Browse the repository at this point in the history
  4. refactor magit-section-case and related functions

    `magit-section-case' used to return t if a clause succeeds but the
    value of it's body is nil.  This was due to internal needs; it allowed
    `run-hook-with-args-until-sucess' to detect that a clause and therefor
    the hook function succeeded.  However, while it was documented in the
    doc-string, callers should not have to deal with this.
    
    * `magit-section-case' and `magit-section-action' always return
      the value of the BODY now.  In other words they can return nil.
    * `magit-section-case' doesn't need to know about OPCODE.
      Running the OPCODE hook is done in `magit-section-action' now.
    * `magit-add-section' wrap each BODY so that `magit-section-action'
      can detect whether a CLAUSE succeeded.  Previously that was done
      in `magit-section-case' for *any* CLAUSE.
    * Disallow a t/otherwise CLAUSE in `magit-section-action' as that
      would prevent the OPCODE hook from running.
    * Replace uses of `magit-section-action' without OPCODE to use
      `magit-section-case' instead.
    tarsius authored and sigma committed Feb 16, 2013
    Copy the full SHA
    4646719 View commit details
    Browse the repository at this point in the history
  5. rename magit-add-action{ => -clauses}

    tarsius authored and sigma committed Feb 16, 2013
    Copy the full SHA
    7cd08d0 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    b266fa3 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'master' into next

    sigma committed Feb 16, 2013
    Copy the full SHA
    25b9b6e View commit details
    Browse the repository at this point in the history
  8. Merge branch 'master' into next

    sigma committed Feb 16, 2013
    Copy the full SHA
    1d3aa45 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2013

  1. Merge branch 'master' into next

    sigma committed Feb 19, 2013
    Copy the full SHA
    dff002c View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2013

  1. Merge branch 'master' into next

    sigma committed Feb 20, 2013
    Copy the full SHA
    e470cc3 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2013

  1. Fixes the incorrect pull refspec.

    This fixes issue #557.
    dudebout committed Feb 22, 2013
    Copy the full SHA
    33a5183 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    842bd55 View commit details
    Browse the repository at this point in the history