Skip to main content

Browse the archive

Revision b91a13bbdca0095b1dc9ffb06bcb5caf4aab56b6 authored by Junio C Hamano on 12 March 2012, 22:43:06 UTC, committed by Junio C Hamano on 12 March 2012, 22:43:15 UTC 
Merge branch 'jc/am-3-nonstandard-popt' into maint
 
The code to synthesize the fake ancestor tree used by 3-way merge
fallback in "git am" was not prepared to read a patch created with
a non-standard -p<num> value.

* jc/am-3-nonstandard-popt:
  test: "am -3" can accept non-standard -p<num>
  am -3: allow nonstandard -p<num> option
2 parent s 0dbe659 + a61ba26
Raw File
url.h 
#ifndef URL_H
#define URL_H

extern int is_url(const char *url);
extern int is_urlschemechar(int first_flag, int ch);
extern char *url_decode(const char *url);
extern char *url_decode_mem(const char *url, int len);
extern char *url_decode_parameter_name(const char **query);
extern char *url_decode_parameter_value(const char **query);

extern void end_url_with_slash(struct strbuf *buf, const char *url);
extern void str_end_url_with_slash(const char *url, char **dest);

#endif /* URL_H */
back to top