mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bc/master-diff-hunk-header-fix'

Browse Source 
* bc/master-diff-hunk-header-fix:
  Clarify commit error message for unmerged files
  Use strchrnul() instead of strchr() plus manual workaround
  Use remove_path from dir.c instead of own implementation
  Add remove_path: a function to remove as much as possible of a path
  git-submodule: Fix "Unable to checkout" for the initial 'update'
  Clarify how the user can satisfy stash's 'dirty state' check.
  t4018-diff-funcname: test syntax of builtin xfuncname patterns
  t4018-diff-funcname: test syntax of builtin xfuncname patterns
  make "git remote" report multiple URLs
  diff hunk pattern: fix misconverted "\{" tex macro introducers
  diff: fix "multiple regexp" semantics to find hunk header comment
  diff: use extended regexp to find hunk headers
  diff: use extended regexp to find hunk headers
  diff.*.xfuncname which uses "extended" regex's for hunk header selection
  diff.c: associate a flag with each pattern and use it for compiling regex
  diff.c: return pattern entry pointer rather than just the hunk header pattern

Conflicts:
	builtin-merge-recursive.c
	t/t7201-co.sh
	xdiff-interface.h
This commit is contained in:
Shawn O. Pearce
2008-09-29 11:04:20 -07:00
parent 9ba929ed65 5a139ba483
commit 9800c0df41
15 changed files with 139 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
merge-recursive.c
View File

@ -19,6 +19,7 @@
#include "interpolate.h"
#include "attr.h"
#include "merge-recursive.h"
#include "dir.h"
static struct tree *shift_tree_object(struct tree *one, struct tree *two)
{
@ -392,22 +393,6 @@ static int update_stages(const char *path, struct diff_filespec *o,
return 0;
}
static int remove_path(const char *name)
{
char *slash, *dirs;
if (unlink(name))
return -1;
dirs = xstrdup(name);
while ((slash = strrchr(name, '/'))) {
*slash = '\0';
if (rmdir(name) != 0)
break;
}
free(dirs);
return 0;
}
static int remove_file(struct merge_options *o, int clean,
const char *path, int no_wd)
{