This project is mirrored from https://github.com/git/git. Updated .
  1. 18 Oct, 2013 1 commit
    • Hemmo Nieminen's avatar
      graph: fix coloring around octopus merges · 339c17bc
      Hemmo Nieminen authored
      When drawing the graph of an octopus merge, we draw a horizontal line
      from parents 3 and above into the asterisk representing the commit. The
      sections of this line should be colored to match the graph lines coming
      in from above.
      
      However, if the commit is not in the left-most column we do not take
      into account the columns to the left of the commit when calculating
      these colors. Fix this by adding the appropriate offset to the column
      index used for calculating the color.
      Signed-off-by: Hemmo Nieminen's avatarHemmo Nieminen <hemmo.nieminen@iki.fi>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      339c17bc
  2. 04 Mar, 2013 1 commit
  3. 07 Feb, 2013 1 commit
    • John Keeping's avatar
      graph: output padding for merge subsequent parents · a48ec241
      John Keeping authored
      When showing merges in git-log, the same commit is shown once for each
      parent.  Combined with "--graph" this results in graph_show_commit()
      being called once for each parent without graph_update() being called.
      
      Currently graph_show_commit() does not print anything on subsequent
      invocations for the same commit (this was changed by commit 656197ad -
      "graph.c: infinite loop in git whatchanged --graph -m" from the previous
      behaviour of looping infinitely).
      
      Change this so that if the graph code believes it has already shown the
      commit it prints a single padding line.
      Signed-off-by: John Keeping's avatarJohn Keeping <john@keeping.me.uk>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      a48ec241
  4. 25 Sep, 2012 1 commit
  5. 16 Sep, 2012 1 commit
  6. 16 Apr, 2012 1 commit
  7. 19 Aug, 2011 1 commit
    • Jeff King's avatar
      color: delay auto-color decision until point of use · daa0c3d9
      Jeff King authored
      When we read a color value either from a config file or from
      the command line, we use git_config_colorbool to convert it
      from the tristate always/never/auto into a single yes/no
      boolean value.
      
      This has some timing implications with respect to starting
      a pager.
      
      If we start (or decide not to start) the pager before
      checking the colorbool, everything is fine. Either isatty(1)
      will give us the right information, or we will properly
      check for pager_in_use().
      
      However, if we decide to start a pager after we have checked
      the colorbool, things are not so simple. If stdout is a tty,
      then we will have already decided to use color. However, the
      user may also have configured color.pager not to use color
      with the pager. In this case, we need to actually turn off
      color. Unfortunately, the pager code has no idea which color
      variables were turned on (and there are many of them
      throughout the code, and they may even have been manipulated
      after the colorbool selection by something like "--color" on
      the command line).
      
      This bug can be seen any time a pager is started after
      config and command line options are checked. This has
      affected "git diff" since 89d07f75 (diff: don't run pager if
      user asked for a diff style exit code, 2007-08-12). It has
      also affect the log family since 1fda91b5 (Fix 'git log'
      early pager startup error case, 2010-08-24).
      
      This patch splits the notion of parsing a colorbool and
      actually checking the configuration. The "use_color"
      variables now have an additional possible value,
      GIT_COLOR_AUTO. Users of the variable should use the new
      "want_color()" wrapper, which will lazily determine and
      cache the auto-color decision.
      Signed-off-by: default avatarJeff King <peff@peff.net>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      daa0c3d9
  8. 18 Aug, 2011 1 commit
    • Jeff King's avatar
      diff: refactor COLOR_DIFF from a flag into an int · f1c96261
      Jeff King authored
      This lets us store more than just a bit flag for whether we
      want color; we can also store whether we want automatic
      colors. This can be useful for making the automatic-color
      decision closer to the point of use.
      
      This mostly just involves replacing DIFF_OPT_* calls with
      manipulations of the flag. The biggest exception is that
      calls to DIFF_OPT_TST must check for "o->use_color > 0",
      which lets an "unknown" value (i.e., the default) stay at
      "no color". In the previous code, a value of "-1" was not
      propagated at all.
      Signed-off-by: default avatarJeff King <peff@peff.net>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      f1c96261
  9. 05 Apr, 2011 1 commit
  10. 09 Mar, 2011 1 commit
  11. 22 Aug, 2010 1 commit
  12. 13 Jul, 2010 2 commits
  13. 01 Jun, 2010 1 commit
  14. 07 Mar, 2010 1 commit
  15. 21 Aug, 2009 1 commit
    • Adam Simpkins's avatar
      graph API: fix bug in graph_is_interesting() · beb5af43
      Adam Simpkins authored
      Previously, graph_is_interesting() did not behave quite the same way as
      the code in get_revision().  As a result, it would sometimes think
      commits were uninteresting, even though get_revision() would return
      them.  This resulted in incorrect lines in the graph output.
      
      This change creates a get_commit_action() function, which
      graph_is_interesting() and simplify_commit() both now use to determine
      if a commit will be shown.  It is identical to the old simplify_commit()
      behavior, except that it never calls rewrite_parents().
      
      This problem was reported by Santi Béjar.  The following command
      would exhibit the problem before, but now works correctly:
      
        git log --graph --simplify-by-decoration --oneline v1.6.3.3
      
      Previously git graph did not display the output for this command
      correctly between f29ac4f1 and 66996ecc, among other places.
      Signed-off-by: default avatarAdam Simpkins <simpkins@facebook.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      beb5af43
  16. 19 Aug, 2009 1 commit
  17. 23 Jul, 2009 1 commit
    • Pierre Habouzit's avatar
      janitor: use NULL and not 0 for pointers. · 67da52be
      Pierre Habouzit authored
      Brought to you thanks to coccinelle:
      
          ---8<----
          @@
          expression *E;
          @@
          (
            E ==
          - 0
          + NULL
          |
            E !=
          - 0
          + NULL
          |
            E =
          - 0
          + NULL
          )
      
          @@
          identifier f;
          type T;
          @@
          T *f(...) {
          <...
          - return 0;
          + return NULL;
          ...>
          }
          --->8----
      
      There are a lot more hits in compat/nedmallox and compat/regex but these
      are borrowed code we rather do not want to maintain our own forks for,
      and this patch refrains from touching them.
      Signed-off-by: default avatarPierre Habouzit <madcoder@debian.org>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      67da52be
  18. 23 Apr, 2009 4 commits
  19. 14 Apr, 2009 1 commit
  20. 12 Oct, 2008 1 commit
  21. 25 Sep, 2008 1 commit
  22. 06 Jun, 2008 2 commits
  23. 02 Jun, 2008 1 commit
  24. 01 Jun, 2008 1 commit
    • Adam Simpkins's avatar
      graph API: improve display of merge commits · 3395908e
      Adam Simpkins authored
      This change improves the way merge commits are displayed, to eliminate a
      few visual artifacts.  Previously, merge commits were displayed as:
      
      | M  \
      | |\  |
      
      As pointed out by Teemu Likonen, this didn't look nice if the rightmost
      branch line was displayed as '\' on the previous line, as it then
      appeared to have an extra space in it:
      
      | |\
      | M  \
      | |\  |
      
      This change updates the code so that branch lines to the right of merge
      commits are printed slightly differently depending on how the previous
      line was displayed:
      
      | |\          | | |        | |  /
      | M \         | M |        | M |
      | |\ \        | |\ \       | |\ \
      Signed-off-by: default avatarAdam Simpkins <adam@adamsimpkins.net>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      3395908e
  25. 25 May, 2008 5 commits
  26. 06 May, 2008 2 commits