thodg/libgit2/src/reset.c

• Show log

  Commit

• Hash : d8057a5b
  Author :
  Date : 2012-08-27T11:53:59
  

  Make git_object_peel a bit smarter This expands the types of peeling that `git_object_peel` knows how to do to include TAG -> BLOB peeling, and makes the errors slightly more consistent depending on the situation. It also adds a new special behavior where peeling to ANY will peel until the object type changes (e.g. chases TAGs to a non-TAG). Using this expanded peeling, this replaces peeling code that was embedded in `git_tag_peel` and `git_reset`.

Download

• src/reset.c

• /*
   * Copyright (C) 2009-2012 the libgit2 contributors
   *
   * This file is part of libgit2, distributed under the GNU GPL v2 with
   * a Linking Exception. For full terms see the included COPYING file.
   */
  
  #include "common.h"
  #include "commit.h"
  #include "tag.h"
  #include "git2/reset.h"
  
  #define ERROR_MSG "Cannot perform reset"
  
  static int reset_error_invalid(const char *msg)
  {
  	giterr_set(GITERR_INVALID, "%s - %s", ERROR_MSG, msg);
  	return -1;
  }
  
  int git_reset(
  	git_repository *repo,
  	git_object *target,
  	git_reset_type reset_type)
  {
  	git_object *commit = NULL;
  	git_index *index = NULL;
  	git_tree *tree = NULL;
  	int error = -1;
  
  	assert(repo && target);
  	assert(reset_type == GIT_RESET_SOFT || reset_type == GIT_RESET_MIXED);
  
  	if (git_object_owner(target) != repo)
  		return reset_error_invalid("The given target does not belong to this repository.");
  
  	if (reset_type == GIT_RESET_MIXED && git_repository_is_bare(repo))
  		return reset_error_invalid("Mixed reset is not allowed in a bare repository.");
  
  	if (git_object_peel(&commit, target, GIT_OBJ_COMMIT) < 0) {
  		reset_error_invalid("The given target does not resolve to a commit");
  		goto cleanup;
  	}
  
  	//TODO: Check for unmerged entries
  
  	if (git_reference__update(repo, git_object_id(commit), GIT_HEAD_FILE) < 0)
  		goto cleanup;
  
  	if (reset_type == GIT_RESET_SOFT) {
  		error = 0;
  		goto cleanup;
  	}
  
  	if (git_commit_tree(&tree, (git_commit *)commit) < 0) {
  		giterr_set(GITERR_OBJECT, "%s - Failed to retrieve the commit tree.", ERROR_MSG);
  		goto cleanup;
  	}
  
  	if (git_repository_index(&index, repo) < 0) {
  		giterr_set(GITERR_OBJECT, "%s - Failed to retrieve the index.", ERROR_MSG);
  		goto cleanup;
  	}
  
  	if (git_index_read_tree(index, tree, NULL) < 0) {
  		giterr_set(GITERR_INDEX, "%s - Failed to update the index.", ERROR_MSG);
  		goto cleanup;
  	}
  
  	if (git_index_write(index) < 0) {
  		giterr_set(GITERR_INDEX, "%s - Failed to write the index.", ERROR_MSG);
  		goto cleanup;
  	}
  
  	error = 0;
  
  cleanup:
  	git_object_free(commit);
  	git_index_free(index);
  	git_tree_free(tree);
  
  	return error;
  }
  

Download