1. 14 9月, 2016 1 次提交
    • J
      patch-id: use RUN_SETUP_GENTLY · 4a73aaaf
      Jeff King 提交于
      Patch-id does not require a repository because it is just
      processing the incoming diff on stdin, but it may look at
      git config for keys like patchid.stable.
      
      Even though we do not setup_git_directory(), this works from
      the top-level of a repository because we blindly look at
      ".git/config" in this case. But as the included test
      demonstrates, it does not work from a subdirectory.
      
      We can fix it by using RUN_SETUP_GENTLY. We do not take any
      filenames from the user on the command line, so there's no
      need to adjust them via prefix_filename().
      Signed-off-by: NJeff King <peff@peff.net>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      4a73aaaf
  2. 07 3月, 2016 1 次提交
    • J
      setup: make startup_info available everywhere · 46c3cd44
      Jeff King 提交于
      Commit a60645f9 (setup: remember whether repository was
      found, 2010-08-05) introduced the startup_info structure,
      which records some parts of the setup_git_directory()
      process (notably, whether we actually found a repository or
      not).
      
      One of the uses of this data is for functions to behave
      appropriately based on whether we are in a repo. But the
      startup_info struct is just a pointer to storage provided by
      the main program, and the only program that sets it up is
      the git.c wrapper. Thus builtins have access to
      startup_info, but externally linked programs do not.
      
      Worse, library code which is accessible from both has to be
      careful about accessing startup_info. This can be used to
      trigger a die("BUG") via get_sha1():
      
      	$ git fast-import <<-\EOF
      	tag foo
      	from HEAD:./whatever
      	EOF
      
      	fatal: BUG: startup_info struct is not initialized.
      
      Obviously that's fairly nonsensical input to feed to
      fast-import, but we should never hit a die("BUG"). And there
      may be other ways to trigger it if other non-builtins
      resolve sha1s.
      
      So let's point the storage for startup_info to a static
      variable in setup.c, making it available to all users of the
      library code. We _could_ turn startup_info into a regular
      extern struct, but doing so would mean tweaking all of the
      existing use sites. So let's leave the pointer indirection
      in place.  We can, however, drop any checks for NULL, as
      they will always be false (and likewise, we can drop the
      test covering this case, which was a rather artificial
      situation using one of the test-* programs).
      Signed-off-by: NJeff King <peff@peff.net>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      46c3cd44
  3. 23 2月, 2016 1 次提交
    • J
      convert manual allocations to argv_array · 850d2fec
      Jeff King 提交于
      There are many manual argv allocations that predate the
      argv_array API. Switching to that API brings a few
      advantages:
      
        1. We no longer have to manually compute the correct final
           array size (so it's one less thing we can screw up).
      
        2. In many cases we had to make a separate pass to count,
           then allocate, then fill in the array. Now we can do it
           in one pass, making the code shorter and easier to
           follow.
      
        3. argv_array handles memory ownership for us, making it
           more obvious when things should be free()d and and when
           not.
      
      Most of these cases are pretty straightforward. In some, we
      switch from "run_command_v" to "run_command" which lets us
      directly use the argv_array embedded in "struct
      child_process".
      Signed-off-by: NJeff King <peff@peff.net>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      850d2fec
  4. 22 2月, 2016 1 次提交
  5. 03 2月, 2016 1 次提交
  6. 28 1月, 2016 3 次提交
    • J
      git: simplify environment save/restore logic · 441981bc
      Junio C Hamano 提交于
      The only code that cares about the value of the global variable
      saved_env_before_alias after the previous fix is handle_builtin()
      that turns into a glorified no-op when the variable is true, so the
      logic could safely be lifted to its caller, i.e. the caller can
      refrain from calling it when the variable is set.
      
      This variable tells us if save_env_before_alias() was called (with
      or without matching restore_env()), but the sole caller of the
      function, handle_alias(), always calls it as the first thing, so we
      can consider that the variable essentially keeps track of the fact
      that handle_alias() has ever been called.
      
      It turns out that handle_builtin() and handle_alias() are called
      only from one function in a way that the value of the variable
      matters, which is run_argv(), and it already keeps track of the
      fact that it already called handle_alias().
      
      So we can simplify the whole thing by:
      
      - Change handle_builtin() to always make a direct call to the
        builtin implementation it finds, and make sure the caller
        refrains from calling it if handle_alias() has ever been
        called;
      
      - Remove saved_env_before_alias variable, and instead use the
        local "done_alias" variable maintained inside run_argv() to
        make the same decision.
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      441981bc
    • J
      git: protect against unbalanced calls to {save,restore}_env() · 2e1175d4
      Junio C Hamano 提交于
      We made sure that save_env_before_alias() does not skip saving the
      environment when asked to (which led to use-after-free of orig_cwd
      in restore_env() in the buggy version) with the previous step.
      
      Protect against future breakage where somebody adds new callers of
      these functions in an unbalanced fashion.
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      2e1175d4
    • J
      git: remove an early return from save_env_before_alias() · 9d1d2b7f
      Junio C Hamano 提交于
      When help.autocorrect is in effect, an attempt to auto-execute an
      uniquely corrected result of a misspelt alias will result in an
      irrelevant error message.  The codepath that causes this calls
      save_env_before_alias() and restore_env() in handle_alias(), and
      that happens twice.  A global variable orig_cwd is allocated to hold
      the return value of getcwd() in save_env_before_alias(), which is
      then used in restore_env() to go back to that directory and finally
      free(3)'d there.
      
      However, save_env_before_alias() is not prepared to be called twice.
      It returns early when it knows it has already been called, leaving
      orig_cwd undefined, which is then checked in the second call to
      restore_env(), and by that time, the memory that used to hold the
      contents of orig_cwd is either freed or reused to hold something
      else, and this is fed to chdir(2), causing it to fail.  Even if it
      did not fail (i.e. reading of the already free'd piece of memory
      yielded a directory path that we can chdir(2) to), it then gets
      free(3)'d.
      
      Fix this by making sure save_env() does do the saving when called.
      
      While at it, add a minimal test for help.autocorrect facility.
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      9d1d2b7f
  7. 23 12月, 2015 3 次提交
    • N
      git.c: make sure we do not leak GIT_* to alias scripts · 57ea7123
      Nguyễn Thái Ngọc Duy 提交于
      The unfortunate commit d95138e6 (setup: set env $GIT_WORK_TREE when
      work tree is set, like $GIT_DIR - 2015-06-26) exposes another problem,
      besides git-clone that's described in the previous commit. If
      GIT_WORK_TREE (or even GIT_DIR) is exported to an alias script, it may
      mislead git commands in the script where the repo is. Granted, most
      scripts work on the repo where the alias is summoned from. But nowhere
      do we forbid the script to visit another repository.
      
      The revert of d95138e6 in the previous commit is sufficient as a
      fix. However, to protect us from accidentally leaking GIT_*
      environment variables again, we restore certain sensitive env before
      calling the external script.
      
      GIT_PREFIX is let through because there's another setup side effect
      that we simply accepted so far: current working directory is
      moved. Maybe in future we can introduce a new alias format that
      guarantees no cwd move, then we can unexport GIT_PREFIX.
      Reported-by: NGabriel Ganne <gabriel.ganne@gmail.com>
      Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      57ea7123
    • N
      setup.c: re-fix d95138e6 (setup: set env $GIT_WORK_TREE when .. · 86d26f24
      Nguyễn Thái Ngọc Duy 提交于
      Commit d95138e6 [1] attempted to fix a .git file problem by
      setting GIT_WORK_TREE whenever GIT_DIR is set. It sounded harmless
      because we handle GIT_DIR and GIT_WORK_TREE side by side for most
      commands, with two exceptions: git-init and git-clone.
      
      "git clone" is not happy with d95138e6. This command ignores GIT_DIR
      but respects GIT_WORK_TREE [2] [3] which means it used to run fine
      from a hook, where GIT_DIR was set but GIT_WORK_TREE was not (*).
      With d95138e6, GIT_WORK_TREE is set all the time and git-clone
      interprets that as "I give you order to put the worktree here",
      usually against the user's intention.
      
      The solution in d95138e6 is reverted earlier, and instead we reuse
      the solution from c0562611 [4].  It fixed another setup-messed-
      up-by-alias by saving and restoring env and spawning a new process,
      but for git-clone and git-init only.
      
      Now we conclude that setup-messed-up-by-alias is always evil. So the
      env restoration is done for _all_ commands, including external ones,
      whenever aliases are involved. It fixes what d95138e6 tried to fix,
      without upsetting git-clone-inside-hooks.
      
      The test from d95138e6 remains to verify it's not broken by this. A new
      test is added to make sure git-clone-inside-hooks remains happy.
      
      (*) GIT_WORK_TREE was not set _most of the time_. In some cases
          GIT_WORK_TREE is set and git-clone will behave differently. The
          use of GIT_WORK_TREE to direct git-clone to put work tree
          elsewhere looks like a mistake because it causes surprises this
          way. But that's a separate story.
      
      [1] d95138e6 (setup: set env $GIT_WORK_TREE when work tree is set, like
                   $GIT_DIR - 2015-06-26)
      [2] 2beebd22 (clone: create intermediate directories of destination
                   repo - 2008-06-25)
      [3] 20ccef49 (make git-clone GIT_WORK_TREE aware - 2007-07-06)
      [4] c0562611 (git potty: restore environments after alias expansion -
                   2014-06-08)
      Reported-by: NAnthony Sottile <asottile@umich.edu>
      Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      86d26f24
    • N
  8. 09 9月, 2015 1 次提交
  9. 04 9月, 2015 1 次提交
    • S
      submodule: rewrite `module_list` shell function in C · 74703a1e
      Stefan Beller 提交于
      Most of the submodule operations work on a set of submodules.
      Calculating and using this set is usually done via:
      
             module_list "$@" | {
                 while read mode sha1 stage sm_path
                 do
                      # the actual operation
                 done
             }
      
      Currently the function `module_list` is implemented in the
      git-submodule.sh as a shell script wrapping a perl script.
      The rewrite is in C, such that it is faster and can later be
      easily adapted when other functions are rewritten in C.
      
      git-submodule.sh, similar to the builtin commands, will navigate
      to the top-most directory of the repository and keep the
      subdirectory as a variable. As the helper is called from
      within the git-submodule.sh script, we are already navigated
      to the root level, but the path arguments are still relative
      to the subdirectory we were in when calling git-submodule.sh.
      That's why there is a `--prefix` option pointing to an alternative
      path which to anchor relative path arguments.
      Signed-off-by: NStefan Beller <sbeller@google.com>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      74703a1e
  10. 05 8月, 2015 2 次提交
    • P
      builtin-am: remove redirection to git-am.sh · 783d7e86
      Paul Tan 提交于
      At the beginning of the rewrite of git-am.sh to C, in order to not break
      existing test scripts that depended on a functional git-am, a
      redirection to git-am.sh was introduced that would activate if the
      environment variable _GIT_USE_BUILTIN_AM was not defined.
      
      Now that all of git-am.sh's functionality has been re-implemented in
      builtin/am.c, remove this redirection, and retire git-am.sh into
      contrib/examples/.
      Signed-off-by: NPaul Tan <pyokagan@gmail.com>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      783d7e86
    • P
      builtin-am: implement skeletal builtin am · 73c2779f
      Paul Tan 提交于
      For the purpose of rewriting git-am.sh into a C builtin, implement a
      skeletal builtin/am.c that redirects to $GIT_EXEC_PATH/git-am if the
      environment variable _GIT_USE_BUILTIN_AM is not defined. Since in the
      Makefile git-am.sh takes precedence over builtin/am.c,
      $GIT_EXEC_PATH/git-am will contain the shell script git-am.sh, and thus
      this allows us to fall back on the functional git-am.sh when running the
      test suite for tests that depend on a working git-am implementation.
      
      Since git-am.sh cannot handle any environment modifications by
      setup_git_directory(), "am" is declared with no setup flags in git.c. On
      the other hand, to re-implement git-am.sh in builtin/am.c, we need to
      run all the git dir and work tree setup logic that git.c typically does
      for us. As such, we work around this temporarily by copying the logic in
      git.c's run_builtin(), which is roughly:
      
      	prefix = setup_git_directory();
      	trace_repo_setup(prefix);
      	setup_work_tree();
      
      This redirection should be removed when all the features of git-am.sh
      have been re-implemented in builtin/am.c.
      Helped-by: NJunio C Hamano <gitster@pobox.com>
      Signed-off-by: NPaul Tan <pyokagan@gmail.com>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      73c2779f
  11. 07 7月, 2015 1 次提交
    • E
      checkout: require worktree unconditionally · 0ca560cb
      Eric Sunshine 提交于
      In order to allow linked worktree creation via "git checkout --to" from
      a bare repository, 3473ad0c (checkout: don't require a work tree when
      checking out into a new one, 2014-11-30) dropped git-checkout's
      unconditional NEED_WORK_TREE requirement and instead performed worktree
      setup conditionally based upon presence or absence of the --to option.
      Now that --to has been retired and git-checkout is no longer responsible
      for linked worktree creation, the NEED_WORK_TREE requirement can be
      re-instated.
      
      This effectively reverts 3473ad0c, except for the tests it added which
      now check bare repository behavior of "git worktree add" instead.
      Signed-off-by: NEric Sunshine <sunshine@sunshineco.com>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      0ca560cb
  12. 29 6月, 2015 1 次提交
  13. 16 6月, 2015 1 次提交
    • P
      pull: implement skeletal builtin pull · 1e1ea69f
      Paul Tan 提交于
      For the purpose of rewriting git-pull.sh into a C builtin, implement a
      skeletal builtin/pull.c that redirects to $GIT_EXEC_PATH/git-pull.sh if
      the environment variable _GIT_USE_BUILTIN_PULL is not defined. This
      allows us to fall back on the functional git-pull.sh when running the
      test suite for tests that depend on a working git-pull implementation.
      
      This redirection should be removed when all the features of git-pull.sh
      have been re-implemented in builtin/pull.c.
      Helped-by: NJunio C Hamano <gitster@pobox.com>
      Signed-off-by: NPaul Tan <pyokagan@gmail.com>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      1e1ea69f
  14. 07 3月, 2015 2 次提交
  15. 15 1月, 2015 1 次提交
  16. 10 1月, 2015 1 次提交
    • A
      git.c: remove unnecessary #includes · 50fea42e
      Alexander Kuleshov 提交于
      "cache.h" and "commit.h" are already included via "builtin.h".
      
      We started to include "quote.h" at 575ba9d6 (GIT_TRACE: show which
      built-in/external commands are executed, 2006-06-25) that wanted to
      use sq_quote_print().
      
      When 6ce4e61f (Trace into a file or an open fd and refactor tracing
      code., 2006-09-02) introduced trace.c API, the calls this file makes
      to sq_quote_print() were replaced by calls to trace_argv_printf()
      that are declared in "cache.h", which this file already includes.
      We should have stopped including "quote.h" in that commit, but
      forgot to do so.
      Signed-off-by: NAlexander Kuleshov <kuleshovmail@gmail.com>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      50fea42e
  17. 02 12月, 2014 1 次提交
    • D
      checkout: don't require a work tree when checking out into a new one · 3473ad0c
      Dennis Kaarsemaker 提交于
      For normal use cases, it does not make sense for 'checkout' to work on
      a bare repository, without a worktree. But "checkout --to" is an
      exception because it _creates_ a new worktree. Allow this option to
      run on bare repositories.
      
      People who check out from a bare repository should remember that
      core.logallrefupdates is off by default and it should be turned back
      on. `--to` cannot do this automatically behind the user's back because
      some user may deliberately want no reflog.
      
      For people interested in repository setup/discovery code,
      is_bare_repository_cfg (aka "core.bare") is unchanged by this patch,
      which means 'true' by default for bare repos. Fortunately when we get
      the repo through a linked checkout, is_bare_repository_cfg is never
      used. So all is still good.
      
      [nd: commit message]
      Signed-off-by: NDennis Kaarsemaker <dennis@kaarsemaker.net>
      Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      3473ad0c
  18. 14 11月, 2014 1 次提交
  19. 14 10月, 2014 1 次提交
  20. 19 9月, 2014 2 次提交
    • P
      unblock and unignore SIGPIPE · 7559a1be
      Patrick Reynolds 提交于
      Blocked and ignored signals -- but not caught signals -- are inherited
      across exec.  Some callers with sloppy signal-handling behavior can call
      git with SIGPIPE blocked or ignored, even non-deterministically.  When
      SIGPIPE is blocked or ignored, several git commands can run indefinitely,
      ignoring EPIPE returns from write() calls, even when the process that
      called them has gone away.  Our specific case involved a pipe of git
      diff-tree output to a script that reads a limited amount of diff data.
      
      In an ideal world, git would never be called with SIGPIPE blocked or
      ignored.  But in the real world, several real potential callers, including
      Perl, Apache, and Unicorn, sometimes spawn subprocesses with SIGPIPE
      ignored.  It is easier and more productive to harden git against this
      mistake than to clean it up in every potential parent process.
      Signed-off-by: NPatrick Reynolds <patrick.reynolds@github.com>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      7559a1be
    • R
      2756ca43
  21. 03 9月, 2014 1 次提交
  22. 27 8月, 2014 1 次提交
  23. 14 7月, 2014 1 次提交
    • K
      git: add performance tracing for git's main() function to debug scripts · 578da039
      Karsten Blees 提交于
      Use trace_performance to measure and print execution time and command line
      arguments of the entire main() function. In constrast to the shell's 'time'
      utility, which measures total time of the parent process, this logs all
      involved git commands recursively. This is particularly useful to debug
      performance issues of scripted commands (i.e. which git commands were
      called with which parameters, and how long did they execute).
      
      Due to git's deliberate use of exit(), the implementation uses an atexit
      routine rather than just adding trace_performance_since() at the end of
      main().
      
      Usage example: > GIT_TRACE_PERFORMANCE=~/git-trace.log git stash list
      
      Creates a log file like this:
      23:57:38.638765 trace.c:405 performance: 0.000310107 s: git command: 'git' 'rev-parse' '--git-dir'
      23:57:38.644387 trace.c:405 performance: 0.000261759 s: git command: 'git' 'rev-parse' '--show-toplevel'
      23:57:38.646207 trace.c:405 performance: 0.000304468 s: git command: 'git' 'config' '--get-colorbool' 'color.interactive'
      23:57:38.648491 trace.c:405 performance: 0.000241667 s: git command: 'git' 'config' '--get-color' 'color.interactive.help' 'red bold'
      23:57:38.650465 trace.c:405 performance: 0.000243063 s: git command: 'git' 'config' '--get-color' '' 'reset'
      23:57:38.654850 trace.c:405 performance: 0.025126313 s: git command: 'git' 'stash' 'list'
      Signed-off-by: NKarsten Blees <blees@dcon.de>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      578da039
  24. 24 6月, 2014 1 次提交
  25. 21 6月, 2014 2 次提交
    • J
      git: avoid magic number with skip_prefix · 6d877803
      Jeff King 提交于
      After handling options, any leftover arguments should be
      commands. However, we pass through "--help" and "--version",
      so that we convert them into "git help" and "git version"
      respectively.
      
      This is a straightforward use of skip_prefix to avoid a
      magic number, but while we are there, it is worth adding a
      comment to explain this otherwise confusing behavior.
      Signed-off-by: NJeff King <peff@peff.net>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      6d877803
    • J
      use skip_prefix to avoid magic numbers · ae021d87
      Jeff King 提交于
      It's a common idiom to match a prefix and then skip past it
      with a magic number, like:
      
        if (starts_with(foo, "bar"))
      	  foo += 3;
      
      This is easy to get wrong, since you have to count the
      prefix string yourself, and there's no compiler check if the
      string changes.  We can use skip_prefix to avoid the magic
      numbers here.
      
      Note that some of these conversions could be much shorter.
      For example:
      
        if (starts_with(arg, "--foo=")) {
      	  bar = arg + 6;
      	  continue;
        }
      
      could become:
      
        if (skip_prefix(arg, "--foo=", &bar))
      	  continue;
      
      However, I have left it as:
      
        if (skip_prefix(arg, "--foo=", &v)) {
      	  bar = v;
      	  continue;
        }
      
      to visually match nearby cases which need to actually
      process the string. Like:
      
        if (skip_prefix(arg, "--foo=", &v)) {
      	  bar = atoi(v);
      	  continue;
        }
      Signed-off-by: NJeff King <peff@peff.net>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      ae021d87
  26. 11 6月, 2014 1 次提交
  27. 23 4月, 2014 1 次提交
  28. 21 2月, 2014 1 次提交
  29. 07 1月, 2014 2 次提交
  30. 11 12月, 2013 1 次提交
  31. 06 12月, 2013 1 次提交
    • C
      replace {pre,suf}fixcmp() with {starts,ends}_with() · 59556548
      Christian Couder 提交于
      Leaving only the function definitions and declarations so that any
      new topic in flight can still make use of the old functions, replace
      existing uses of the prefixcmp() and suffixcmp() with new API
      functions.
      
      The change can be recreated by mechanically applying this:
      
          $ git grep -l -e prefixcmp -e suffixcmp -- \*.c |
            grep -v strbuf\\.c |
            xargs perl -pi -e '
              s|!prefixcmp\(|starts_with\(|g;
              s|prefixcmp\(|!starts_with\(|g;
              s|!suffixcmp\(|ends_with\(|g;
              s|suffixcmp\(|!ends_with\(|g;
            '
      
      on the result of preparatory changes in this series.
      Signed-off-by: NChristian Couder <chriscool@tuxfamily.org>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      59556548